Rename sub_op_keyword to sub_op_config_t

For accuracy and consistency.

diff --git a/Op.xs b/Op.xs
index 44c283e99c25c43e10edf4d4c237c54eb082d1c3..bc85f7f921a4cf43c7af85f2e264bbb55c675f8d 100644 (file)
--- a/Op.xs
+++ b/Op.xs
@@ -113,26 +113,26 @@ typedef struct {
 
 #include "sub_op.h"
 
-void sub_op_register(pTHX_ const sub_op_keyword *k) {
- SV *key = newSViv(PTR2IV(k->pp));
+void sub_op_register(pTHX_ const sub_op_config_t *c) {
+ SV *key = newSViv(PTR2IV(c->pp));
 
  if (!PL_custom_op_names)
   PL_custom_op_names = newHV();
- (void) hv_store_ent(PL_custom_op_names, key, newSVpv(k->name, k->len), 0);
+ (void) hv_store_ent(PL_custom_op_names, key, newSVpv(c->name, c->len), 0);
 
  if (!PL_custom_op_descs)
   PL_custom_op_descs = newHV();
- (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(k->name, k->len), 0);
+ (void) hv_store_ent(PL_custom_op_descs, key, newSVpv(c->name, c->len), 0);
 
- if (k->check) {
-  SV *check = newSViv(PTR2IV(k->check));
-  sv_magicext(key, check, PERL_MAGIC_ext, NULL, k->ud, 0);
+ if (c->check) {
+  SV *check = newSViv(PTR2IV(c->check));
+  sv_magicext(key, check, PERL_MAGIC_ext, NULL, c->ud, 0);
   SvREFCNT_dec(check);
  }
 
  {
   dMY_CXT;
-  (void) hv_store(MY_CXT.map, k->name, k->len, key, 0);
+  (void) hv_store(MY_CXT.map, c->name, c->len, key, 0);
  }
 }
 

diff --git a/lib/Sub/Op.pm b/lib/Sub/Op.pm
index 6459b04c3b64a6977746d416ee9c17cae833da23..877cf3123c4a64ec15272a76b3ae29773155f60b 100644 (file)
--- a/lib/Sub/Op.pm
+++ b/lib/Sub/Op.pm
@@ -49,13 +49,13 @@ In your XS file :
 
     BOOT:
     {
-     sub_op_keyword k;
-     k.name  = "reftype";
-     k.len   = sizeof("reftype")-1;
-     k.pp    = scalar_util_reftype;
-     k.check = 0;
-     k.ud    = NULL;
-     sub_op_register(aTHX_ &k);
+     sub_op_config_t c;
+     c.name  = "reftype";
+     c.len   = sizeof("reftype")-1;
+     c.pp    = scalar_util_reftype;
+     c.check = 0;
+     c.ud    = NULL;
+     sub_op_register(aTHX_ &c);
     }
 
 In your Perl module file :

diff --git a/sub_op.h b/sub_op.h
index c7fc83f0e9240e1c3fa8e5e3650bfd9e703c0e4b..20733c1888dbfb2f463fdcdb99deb4f8ab0078be 100644 (file)
--- a/sub_op.h
+++ b/sub_op.h
@@ -12,8 +12,8 @@ typedef struct {
  Perl_ppaddr_t  pp;
  sub_op_check_t check;
  void          *ud;
-} sub_op_keyword;
+} sub_op_config_t;
 
-void sub_op_register(pTHX_ const sub_op_keyword *k);
+void sub_op_register(pTHX_ const sub_op_config_t *c);
 
 #endif /* SUB_OP_H */

diff --git a/t/Sub-Op-Test/Test.xs b/t/Sub-Op-Test/Test.xs
index b3179698622f1592fcfe6c1ba5562ceca965bdc6..4a7b97028bc17c844a2ee28157bc75c40f7018df 100644 (file)
--- a/t/Sub-Op-Test/Test.xs
+++ b/t/Sub-Op-Test/Test.xs
@@ -70,16 +70,16 @@ void
 _init(SV *name, SV *cb)
 PROTOTYPE: $$
 PREINIT:
- sub_op_keyword k;
+ sub_op_config_t c;
 PPCODE:
  if (SvROK(cb)) {
   cb = SvRV(cb);
   if (SvTYPE(cb) >= SVt_PVCV) {
-   k.name  = SvPV_const(name, k.len);
-   k.check = sub_op_test_check;
-   k.ud    = SvREFCNT_inc(cb);
-   k.pp    = sub_op_test_pp;
-   sub_op_register(aTHX_ &k);
+   c.name  = SvPV_const(name, c.len);
+   c.check = sub_op_test_check;
+   c.ud    = SvREFCNT_inc(cb);
+   c.pp    = sub_op_test_pp;
+   sub_op_register(aTHX_ &c);
   }
  }
  XSRETURN(0);