X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ec3bab8e3bf51c4a5f1cb8ab2f17c1c54f83967b..fb1ee0ec5828ec8a55002a46636da2e885a4fc4c:/universal.c

diff --git a/universal.c b/universal.c
index ad80a21..10dddb5 100644
--- a/universal.c
+++ b/universal.c
@@ -66,7 +66,7 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
     {
 	if (SvIV(subgen) == (IV)PL_sub_generation) {
 	    SV* sv;
-	    SV** svp = (SV**)hv_fetch(hv, name, len, FALSE);
+	    SV** const svp = (SV**)hv_fetch(hv, name, len, FALSE);
 	    if (svp && (sv = *svp) != (SV*)&PL_sv_undef) {
 	        DEBUG_o( Perl_deb(aTHX_ "Using cached ISA %s for package %s\n",
 				  name, hvname) );
@@ -104,8 +104,8 @@ S_isa_lookup(pTHX_ HV *stash, const char *name, HV* name_stash,
 	    /* NOTE: No support for tied ISA */
 	    I32 items = AvFILLp(av) + 1;
 	    while (items--) {
-		SV* sv = *svp++;
-		HV* basestash = gv_stashsv(sv, FALSE);
+		SV* const sv = *svp++;
+		HV* const basestash = gv_stashsv(sv, FALSE);
 		if (!basestash) {
 		    if (ckWARN(WARN_MISC))
 			Perl_warner(aTHX_ packWARN(WARN_SYNTAX),
@@ -144,8 +144,7 @@ Perl_sv_derived_from(pTHX_ SV *sv, const char *name)
     HV *stash = Nullhv;
     HV *name_stash;
 
-    if (SvGMAGICAL(sv))
-        mg_get(sv) ;
+    SvGETMAGIC(sv);
 
     if (SvROK(sv)) {
         sv = SvRV(sv);
@@ -254,25 +253,24 @@ Perl_boot_core_UNIVERSAL(pTHX)
 XS(XS_UNIVERSAL_isa)
 {
     dXSARGS;
-    SV *sv;
-    const char *name;
 
     if (items != 2)
 	Perl_croak(aTHX_ "Usage: UNIVERSAL::isa(reference, kind)");
+    else {
+	SV * const sv = ST(0);
+	const char *name;
 
-    sv = ST(0);
-
-    if (SvGMAGICAL(sv))
-	mg_get(sv);
+	SvGETMAGIC(sv);
 
-    if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
-		|| (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
-	XSRETURN_UNDEF;
+	if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
+		    || (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
+	    XSRETURN_UNDEF;
 
-    name = SvPV_nolen_const(ST(1));
+	name = SvPV_nolen_const(ST(1));
 
-    ST(0) = boolSV(sv_derived_from(sv, name));
-    XSRETURN(1);
+	ST(0) = boolSV(sv_derived_from(sv, name));
+	XSRETURN(1);
+    }
 }
 
 XS(XS_UNIVERSAL_can)
@@ -288,8 +286,7 @@ XS(XS_UNIVERSAL_can)
 
     sv = ST(0);
 
-    if (SvGMAGICAL(sv))
-	mg_get(sv);
+    SvGETMAGIC(sv);
 
     if (!SvOK(sv) || !(SvROK(sv) || (SvPOK(sv) && SvCUR(sv))
 		|| (SvGMAGICAL(sv) && SvPOKp(sv) && SvCUR(sv))))
@@ -308,7 +305,7 @@ XS(XS_UNIVERSAL_can)
     }
 
     if (pkg) {
-        GV *gv = gv_fetchmethod_autoload(pkg, name, FALSE);
+	GV * const gv = gv_fetchmethod_autoload(pkg, name, FALSE);
         if (gv && isGV(gv))
 	    rv = sv_2mortal(newRV((SV*)GvCV(gv)));
     }
@@ -338,8 +335,8 @@ XS(XS_UNIVERSAL_VERSION)
 
     gvp = pkg ? (GV**)hv_fetch(pkg,"VERSION",7,FALSE) : Null(GV**);
 
-    if (gvp && isGV(gv = *gvp) && SvOK(sv = GvSV(gv))) {
-        SV *nsv = sv_newmortal();
+    if (gvp && isGV(gv = *gvp) && (sv = GvSV(gv)) && SvOK(sv)) {
+        SV * const nsv = sv_newmortal();
         sv_setsv(nsv, sv);
         sv = nsv;
 	if ( !sv_derived_from(sv, "version"))
@@ -356,7 +353,7 @@ XS(XS_UNIVERSAL_VERSION)
 
 	if (undef) {
 	    if (pkg) {
-		const char *name = HvNAME_get(pkg);
+		const char * const name = HvNAME_get(pkg);
 		Perl_croak(aTHX_
 			   "%s does not define $%s::VERSION--version check failed",
 			   name, name);
@@ -369,7 +366,7 @@ XS(XS_UNIVERSAL_VERSION)
 
 	if ( !sv_derived_from(req, "version")) {
 	    /* req may very well be R/O, so create a new object */
-	    SV *nsv = sv_newmortal();
+	    SV * const nsv = sv_newmortal();
 	    sv_setsv(nsv, req);
 	    req = nsv;
 	    upg_version(req);
@@ -399,15 +396,10 @@ XS(XS_version_new)
     {
         SV *vs = ST(1);
 	SV *rv;
-	const char *classname;
-
-	/* get the class if called as an object method */
-	if ( sv_isobject(ST(0)) ) {
-	    classname = HvNAME(SvSTASH(SvRV(ST(0))));
-	}
-	else {
-	    classname = (char *)SvPV_nolen(ST(0));
-	}
+	const char * const classname =
+	    sv_isobject(ST(0)) /* get the class if called as an object method */
+		? HvNAME(SvSTASH(SvRV(ST(0))))
+		: (char *)SvPV_nolen(ST(0));
 
 	if ( items == 1 ) {
 	    /* no parameter provided */
@@ -418,7 +410,7 @@ XS(XS_version_new)
 	    else {
 		/* create empty object */
 		vs = sv_newmortal();
-		sv_setpv(vs,"");
+		sv_setpvn(vs,"",0);
 	    }
 	}
 	else if ( items == 3 ) {
@@ -443,7 +435,7 @@ XS(XS_version_stringify)
 	  Perl_croak(aTHX_ "Usage: version::stringify(lobj, ...)");
      SP -= items;
      {
-	  SV *	lobj = Nullsv;
+	  SV *	lobj;
 
 	  if (sv_derived_from(ST(0), "version")) {
 	       lobj = SvRV(ST(0));
@@ -465,7 +457,7 @@ XS(XS_version_numify)
 	  Perl_croak(aTHX_ "Usage: version::numify(lobj, ...)");
      SP -= items;
      {
-	  SV *	lobj = Nullsv;
+	  SV *	lobj;
 
 	  if (sv_derived_from(ST(0), "version")) {
 	       lobj = SvRV(ST(0));
@@ -487,7 +479,7 @@ XS(XS_version_normal)
 	  Perl_croak(aTHX_ "Usage: version::normal(lobj, ...)");
      SP -= items;
      {
-	  SV *	lobj = Nullsv;
+	  SV *	lobj;
 
 	  if (sv_derived_from(ST(0), "version")) {
 	       lobj = SvRV(ST(0));
@@ -509,7 +501,7 @@ XS(XS_version_vcmp)
 	  Perl_croak(aTHX_ "Usage: version::vcmp(lobj, ...)");
      SP -= items;
      {
-	  SV *	lobj = Nullsv;
+	  SV *	lobj;
 
 	  if (sv_derived_from(ST(0), "version")) {
 	       lobj = SvRV(ST(0));
@@ -521,7 +513,7 @@ XS(XS_version_vcmp)
 	       SV	*rs;
 	       SV	*rvs;
 	       SV * robj = ST(1);
-	       IV	 swap = (IV)SvIV(ST(2));
+	       const IV	 swap = (IV)SvIV(ST(2));
 
 	       if ( ! sv_derived_from(robj, "version") )
 	       {
@@ -552,24 +544,15 @@ XS(XS_version_boolean)
      if (items < 1)
 	  Perl_croak(aTHX_ "Usage: version::boolean(lobj, ...)");
      SP -= items;
-     {
-	  SV *	lobj = Nullsv;
-
-	  if (sv_derived_from(ST(0), "version")) {
-	       lobj = SvRV(ST(0));
-	  }
-	  else
-	       Perl_croak(aTHX_ "lobj is not of type version");
-
-	  {
-	       SV	*rs;
-	       rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
-	       PUSHs(sv_2mortal(rs));
-	  }
-
-	  PUTBACK;
-	  return;
-     }
+    if (sv_derived_from(ST(0), "version")) {
+	SV * const lobj = SvRV(ST(0));
+	SV * const rs = newSViv( vcmp(lobj,new_version(newSVpvn("0",1))) );
+	PUSHs(sv_2mortal(rs));
+	PUTBACK;
+	return;
+    }
+    else
+	Perl_croak(aTHX_ "lobj is not of type version");
 }
 
 XS(XS_version_noop)
@@ -592,22 +575,17 @@ XS(XS_version_is_alpha)
     if (items != 1)
 	Perl_croak(aTHX_ "Usage: version::is_alpha(lobj)");
     SP -= items;
-    {
-	SV * lobj = Nullsv;
-
-        if (sv_derived_from(ST(0), "version"))
-        	lobj = ST(0);
-        else
-                Perl_croak(aTHX_ "lobj is not of type version");
-{
-    if ( hv_exists((HV*)SvRV(lobj), "alpha", 5 ) )
-	XSRETURN_YES;
-    else
-	XSRETURN_NO;
-}
+    if (sv_derived_from(ST(0), "version")) {
+	SV * const lobj = ST(0);
+	if ( hv_exists((HV*)SvRV(lobj), "alpha", 5 ) )
+	    XSRETURN_YES;
+	else
+	    XSRETURN_NO;
 	PUTBACK;
 	return;
     }
+    else
+	Perl_croak(aTHX_ "lobj is not of type version");
 }
 
 XS(XS_version_qv)
@@ -618,15 +596,14 @@ XS(XS_version_qv)
     SP -= items;
     {
 	SV *	ver = ST(0);
-	if ( !SvVOK(ver) ) /* only need to do with if not already v-string */
-	{
-	    SV *vs = sv_newmortal();
+	if ( !SvVOK(ver) ) { /* only need to do with if not already v-string */
+	    SV * const vs = sv_newmortal();
 	    char *version;
 	    if ( SvNOK(ver) ) /* may get too much accuracy */
 	    {
 		char tbuf[64];
-		sprintf(tbuf,"%.9"NVgf, SvNVX(ver));
-		version = savepv(tbuf);
+		const STRLEN len = my_sprintf(tbuf,"%.9"NVgf, SvNVX(ver));
+		version = savepvn(tbuf, len);
 	    }
 	    else
 	    {
@@ -652,14 +629,12 @@ XS(XS_utf8_is_utf8)
      dXSARGS;
      if (items != 1)
 	  Perl_croak(aTHX_ "Usage: utf8::is_utf8(sv)");
-     {
-          const SV *sv = ST(0);
-	  {
-	       if (SvUTF8(sv))
-		    XSRETURN_YES;
-	       else
-		    XSRETURN_NO;
-	  }
+     else {
+	const SV * const sv = ST(0);
+	    if (SvUTF8(sv))
+		XSRETURN_YES;
+	    else
+		XSRETURN_NO;
      }
      XSRETURN_EMPTY;
 }
@@ -669,17 +644,15 @@ XS(XS_utf8_valid)
      dXSARGS;
      if (items != 1)
 	  Perl_croak(aTHX_ "Usage: utf8::valid(sv)");
-     {
-	  SV *	sv = ST(0);
-	  {
-	       STRLEN len;
-	       const char *s = SvPV_const(sv,len);
-	       if (!SvUTF8(sv) || is_utf8_string((const U8*)s,len))
-		    XSRETURN_YES;
-	       else
-		    XSRETURN_NO;
-	  }
-     }
+    else {
+	SV * const sv = ST(0);
+	STRLEN len;
+	const char * const s = SvPV_const(sv,len);
+	if (!SvUTF8(sv) || is_utf8_string((const U8*)s,len))
+	    XSRETURN_YES;
+	else
+	    XSRETURN_NO;
+    }
      XSRETURN_EMPTY;
 }
 
@@ -688,11 +661,7 @@ XS(XS_utf8_encode)
     dXSARGS;
     if (items != 1)
 	Perl_croak(aTHX_ "Usage: utf8::encode(sv)");
-    {
-	SV *	sv = ST(0);
-
-	sv_utf8_encode(sv);
-    }
+    sv_utf8_encode(ST(0));
     XSRETURN_EMPTY;
 }
 
@@ -701,8 +670,8 @@ XS(XS_utf8_decode)
     dXSARGS;
     if (items != 1)
 	Perl_croak(aTHX_ "Usage: utf8::decode(sv)");
-    {
-	SV *	sv = ST(0);
+    else {
+	SV * const sv = ST(0);
 	const bool RETVAL = sv_utf8_decode(sv);
 	ST(0) = boolSV(RETVAL);
 	sv_2mortal(ST(0));
@@ -715,8 +684,8 @@ XS(XS_utf8_upgrade)
     dXSARGS;
     if (items != 1)
 	Perl_croak(aTHX_ "Usage: utf8::upgrade(sv)");
-    {
-	SV *	sv = ST(0);
+    else {
+	SV * const sv = ST(0);
 	STRLEN	RETVAL;
 	dXSTARG;
 
@@ -731,8 +700,8 @@ XS(XS_utf8_downgrade)
     dXSARGS;
     if (items < 1 || items > 2)
 	Perl_croak(aTHX_ "Usage: utf8::downgrade(sv, failok=0)");
-    {
-	SV *	sv = ST(0);
+    else {
+	SV * const sv = ST(0);
         const bool failok = (items < 2) ? 0 : (int)SvIV(ST(1));
         const bool RETVAL = sv_utf8_downgrade(sv, failok);
 
@@ -769,7 +738,7 @@ XS(XS_utf8_unicode_to_native)
 XS(XS_Internals_SvREADONLY)	/* This is dangerous stuff. */
 {
     dXSARGS;
-    SV *sv = SvRV(ST(0));
+    SV * const sv = SvRV(ST(0));
 
     if (items == 1) {
 	 if (SvREADONLY(sv))
@@ -794,7 +763,7 @@ XS(XS_Internals_SvREADONLY)	/* This is dangerous stuff. */
 XS(XS_Internals_SvREFCNT)	/* This is dangerous stuff. */
 {
     dXSARGS;
-    SV *sv = SvRV(ST(0));
+    SV * const sv = SvRV(ST(0));
 
     if (items == 1)
 	 XSRETURN_IV(SvREFCNT(sv) - 1); /* Minus the ref created for us. */
@@ -809,12 +778,14 @@ XS(XS_Internals_SvREFCNT)	/* This is dangerous stuff. */
 XS(XS_Internals_hv_clear_placehold)
 {
     dXSARGS;
-    HV *hv = (HV *) SvRV(ST(0));
 
     if (items != 1)
 	Perl_croak(aTHX_ "Usage: UNIVERSAL::hv_clear_placeholders(hv)");
-    hv_clear_placeholders(hv);
-    XSRETURN(0);
+    else {
+	HV * const hv = (HV *) SvRV(ST(0));
+	hv_clear_placeholders(hv);
+	XSRETURN(0);
+    }
 }
 
 XS(XS_Regexp_DESTROY)
@@ -836,13 +807,12 @@ XS(XS_PerlIO_get_layers)
 	bool	details = FALSE;
 
 	if (items > 1) {
-	     SV **svp;
-	     
+	     SV * const *svp;
 	     for (svp = MARK + 2; svp <= SP; svp += 2) {
-		  SV **varp = svp;
-		  SV **valp = svp + 1;
+		  SV * const * const varp = svp;
+		  SV * const * const valp = svp + 1;
 		  STRLEN klen;
-                  const char *key = SvPV_const(*varp, klen);
+		  const char * const key = SvPV_const(*varp, klen);
 
 		  switch (*key) {
 		  case 'i':
@@ -880,31 +850,26 @@ XS(XS_PerlIO_get_layers)
 	if (!isGV(sv)) {
 	     if (SvROK(sv) && isGV(SvRV(sv)))
 		  gv = (GV*)SvRV(sv);
-	     else
+	     else if (SvPOKp(sv))
 		  gv = gv_fetchsv(sv, FALSE, SVt_PVIO);
 	}
 
 	if (gv && (io = GvIO(gv))) {
 	     dTARGET;
-	     AV* av = PerlIO_get_layers(aTHX_ input ?
+	     AV* const av = PerlIO_get_layers(aTHX_ input ?
 					IoIFP(io) : IoOFP(io));
 	     I32 i;
-	     I32 last = av_len(av);
+	     const I32 last = av_len(av);
 	     I32 nitem = 0;
 	     
 	     for (i = last; i >= 0; i -= 3) {
-		  SV **namsvp;
-		  SV **argsvp;
-		  SV **flgsvp;
-		  bool namok, argok, flgok;
-
-		  namsvp = av_fetch(av, i - 2, FALSE);
-		  argsvp = av_fetch(av, i - 1, FALSE);
-		  flgsvp = av_fetch(av, i,     FALSE);
+		  SV * const * const namsvp = av_fetch(av, i - 2, FALSE);
+		  SV * const * const argsvp = av_fetch(av, i - 1, FALSE);
+		  SV * const * const flgsvp = av_fetch(av, i,     FALSE);
 
-		  namok = namsvp && *namsvp && SvPOK(*namsvp);
-		  argok = argsvp && *argsvp && SvPOK(*argsvp);
-		  flgok = flgsvp && *flgsvp && SvIOK(*flgsvp);
+		  const bool namok = namsvp && *namsvp && SvPOK(*namsvp);
+		  const bool argok = argsvp && *argsvp && SvPOK(*argsvp);
+		  const bool flgok = flgsvp && *flgsvp && SvIOK(*flgsvp);
 
 		  if (details) {
 		       XPUSHs(namok
@@ -929,7 +894,7 @@ XS(XS_PerlIO_get_layers)
 			    XPUSHs(&PL_sv_undef);
 		       nitem++;
 		       if (flgok) {
-			    IV flags = SvIVX(*flgsvp);
+			    const IV flags = SvIVX(*flgsvp);
 
 			    if (flags & PERLIO_F_UTF8) {
 				 XPUSHs(newSVpvn("utf8", 4));
@@ -973,7 +938,7 @@ XS(XS_Internals_HvREHASH)	/* Subject to change  */
 {
     dXSARGS;
     if (SvROK(ST(0))) {
-	const HV *hv = (HV *) SvRV(ST(0));
+	const HV * const hv = (HV *) SvRV(ST(0));
 	if (items == 1 && SvTYPE(hv) == SVt_PVHV) {
 	    if (HvREHASH(hv))
 		XSRETURN_YES;