This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
In deparse.t, rename %reason to %meta.
[perl5.git] / XSUB.h
diff --git a/XSUB.h b/XSUB.h
index 7a7e882..4e439f1 100644 (file)
--- a/XSUB.h
+++ b/XSUB.h
@@ -48,7 +48,15 @@ Used to access elements on the XSUB's stack.
 
 =for apidoc AmU||XS
 Macro to declare an XSUB and its C parameter list.  This is handled by
-C<xsubpp>.
+C<xsubpp>. It is the same as using the more explicit XS_EXTERNAL macro.
+
+=for apidoc AmU||XS_INTERNAL
+Macro to declare an XSUB and its C parameter list without exporting the symbols.
+This is handled by C<xsubpp> and generally preferable over exporting the XSUB
+symbols unnecessarily.
+
+=for apidoc AmU||XS_EXTERNAL
+Macro to declare an XSUB and its C parameter list explicitly exporting the symbols.
 
 =for apidoc Ams||dAX
 Sets up the C<ax> variable.
@@ -73,7 +81,7 @@ handled automatically by C<xsubpp>.
 
 =for apidoc Ams||dUNDERBAR
 Sets up any variable needed by the C<UNDERBAR> macro. It used to define
-C<padoff_du>, but it is currently a noop. However, it is strongly adviced
+C<padoff_du>, but it is currently a noop. However, it is strongly advised
 to still use it for ensuring past and future compatibility.
 
 =for apidoc AmU||UNDERBAR
@@ -107,27 +115,46 @@ is a lexical $_ in scope.
  * Don't forget to change the __attribute__unused__ version of XS()
  * below too if you change XSPROTO() here.
  */
+
+/* XS_INTERNAL is the explicit static-linkage variant of the default
+ * XS macro.
+ *
+ * XS_EXTERNAL is the same as XS_INTERNAL except it does not include
+ * "STATIC", ie. it exports XSUB symbols. You probably don't want that.
+ */
+
 #define XSPROTO(name) void name(pTHX_ CV* cv)
 
 #undef XS
+#undef XS_EXTERNAL
+#undef XS_INTERNAL
 #if defined(__CYGWIN__) && defined(USE_DYNAMIC_LOADING)
-#  define XS(name) __declspec(dllexport) XSPROTO(name)
+#  define XS_EXTERNAL(name) __declspec(dllexport) XSPROTO(name)
+#  define XS_INTERNAL(name) STATIC XSPROTO(name)
 #endif
 #if defined(__SYMBIAN32__)
-#  define XS(name) EXPORT_C XSPROTO(name)
+#  define XS_EXTERNAL(name) EXPORT_C XSPROTO(name)
+#  define XS_INTERNAL(name) EXPORT_C STATIC XSPROTO(name)
 #endif
-#ifndef XS
+#ifndef XS_EXTERNAL
 #  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
-#    define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
+#    define XS_EXTERNAL(name) void name(pTHX_ CV* cv __attribute__unused__)
+#    define XS_INTERNAL(name) STATIC void name(pTHX_ CV* cv __attribute__unused__)
 #  else
 #    ifdef __cplusplus
-#      define XS(name) extern "C" XSPROTO(name)
+#      define XS_EXTERNAL(name) extern "C" XSPROTO(name)
+#      define XS_INTERNAL(name) static XSPROTO(name)
 #    else
-#      define XS(name) XSPROTO(name)
+#      define XS_EXTERNAL(name) XSPROTO(name)
+#      define XS_INTERNAL(name) STATIC XSPROTO(name)
 #    endif
 #  endif
 #endif
 
+/* We do export xsub symbols by default for the public XS macro.
+ * Try explicitly using XS_INTERNAL/XS_EXTERNAL instead, please. */
+#define XS(name) XS_EXTERNAL(name)
+
 #define dAX const I32 ax = (I32)(MARK - PL_stack_base + 1)
 
 #define dAXMARK                                \
@@ -298,66 +325,13 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 
 #ifdef XS_VERSION
 #  define XS_VERSION_BOOTCHECK                                         \
-    STMT_START {                                                       \
-       SV *_sv;                                                        \
-       const char *vn = NULL, *module = SvPV_nolen_const(ST(0));       \
-       if (items >= 2)  /* version supplied as bootstrap arg */        \
-           _sv = ST(1);                                                \
-       else {                                                          \
-           /* XXX GV_ADDWARN */                                        \
-           _sv = get_sv(Perl_form(aTHX_ "%s::%s", module,              \
-                               vn = "XS_VERSION"), 0);                 \
-           if (!_sv || !SvOK(_sv))                                     \
-               _sv = get_sv(Perl_form(aTHX_ "%s::%s", module,          \
-                                   vn = "VERSION"), 0);                \
-       }                                                               \
-       if (_sv) {                                                      \
-           SV *xpt = NULL;                                             \
-           SV *xssv = Perl_newSVpvn(aTHX_ STR_WITH_LEN(XS_VERSION));   \
-           SV *pmsv = sv_derived_from(_sv, "version")                  \
-               ? SvREFCNT_inc_simple_NN(_sv)                           \
-               : new_version(_sv);                                     \
-           xssv = upg_version(xssv, 0);                                \
-           if ( vcmp(pmsv,xssv) ) {                                    \
-               xpt = Perl_newSVpvf(aTHX_ "%s object version %"SVf      \
-                                   " does not match %s%s%s%s %"SVf,    \
-                                   module,                             \
-                                   SVfARG(Perl_sv_2mortal(aTHX_ vstringify(xssv))), \
-                                   vn ? "$" : "", vn ? module : "",    \
-                                   vn ? "::" : "",                     \
-                                   vn ? vn : "bootstrap parameter",    \
-                                   SVfARG(Perl_sv_2mortal(aTHX_ vstringify(pmsv)))); \
-               Perl_sv_2mortal(aTHX_ xpt);                             \
-           }                                                           \
-           SvREFCNT_dec(xssv);                                         \
-           SvREFCNT_dec(pmsv);                                         \
-           if (xpt)                                                    \
-               Perl_croak_sv(aTHX_ xpt);                               \
-       }                                                               \
-    } STMT_END
+    Perl_xs_version_bootcheck(aTHX_ items, ax, STR_WITH_LEN(XS_VERSION))
 #else
 #  define XS_VERSION_BOOTCHECK
 #endif
 
 #define XS_APIVERSION_BOOTCHECK                                                \
-    STMT_START {                                                       \
-       SV *_xpt = NULL;                                                \
-       SV *_compver = Perl_newSVpv(aTHX_ "v" PERL_API_VERSION_STRING, 0); \
-       SV *_runver = new_version(PL_apiversion);                       \
-       _compver = upg_version(_compver, 0);                            \
-       if (vcmp(_compver, _runver)) {                                  \
-           _xpt = Perl_newSVpvf(aTHX_ "Perl API version %"SVf          \
-                                " of %s does not match %"SVf,          \
-                                SVfARG(Perl_sv_2mortal(aTHX_ vstringify(_compver))), \
-                                SvPV_nolen_const(ST(0)),               \
-                                SVfARG(Perl_sv_2mortal(aTHX_ vstringify(_runver)))); \
-           Perl_sv_2mortal(aTHX_ _xpt);                                \
-       }                                                               \
-       SvREFCNT_dec(_compver);                                         \
-       SvREFCNT_dec(_runver);                                          \
-       if (_xpt)                                                       \
-           Perl_croak_sv(aTHX_ _xpt);                                  \
-    } STMT_END
+    Perl_xs_apiversion_bootcheck(aTHX_ ST(0), STR_WITH_LEN("v" PERL_API_VERSION_STRING))
 
 #ifdef NO_XSLOCKS
 #  define dXCPT             dJMPENV; int rEtV = 0
@@ -420,7 +394,6 @@ Rethrows a previously caught exception.  See L<perlguts/"Exception Handling">.
 #  define VTBL_sv              &PL_vtbl_sv
 #  define VTBL_env             &PL_vtbl_env
 #  define VTBL_envelem         &PL_vtbl_envelem
-#  define VTBL_sig             &PL_vtbl_sig
 #  define VTBL_sigelem         &PL_vtbl_sigelem
 #  define VTBL_pack            &PL_vtbl_pack
 #  define VTBL_packelem                &PL_vtbl_packelem