cvs commit: ponie/perl gv.c sv.c sv.h util.c

cvsuser     05/04/30 01:11:43

  Modified:    perl     gv.c sv.c sv.h util.c
  Log:
  Remove the last trace of SvPMC
  
  Revision  Changes    Path
  1.9       +10 -25    ponie/perl/gv.c
  
  Index: gv.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/gv.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- gv.c	19 Apr 2005 19:04:13 -0000	1.8
  +++ gv.c	30 Apr 2005 08:11:43 -0000	1.9
  @@ -36,43 +36,28 @@
   #include "parrot/extend.h"
   
   GP** Perl_macro_GvGP (pTHX_ GV *sv) {
  -  if(SvPMC(sv)) {
  -    XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  -    return &(data->xgv_gp);
  -  }
  -  return &((XPVGV*)SvANY(sv))->xgv_gp;
  +  XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  +  return &(data->xgv_gp);
   }
   
   char** Perl_macro_GvNAME (pTHX_ GV *sv) {
  -  if(SvPMC(sv)) {
  -    XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  -    return &(data->xgv_name);
  -  }
  -  return &((XPVGV*)SvANY(sv))->xgv_name;
  +  XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  +  return &(data->xgv_name);
   }
   
   STRLEN* Perl_macro_GvNAMELEN (pTHX_ GV *sv) {
  -  if(SvPMC(sv)) {
  -    XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  -    return &(data->xgv_namelen);
  -  }
  -  return &((XPVGV*)SvANY(sv))->xgv_namelen;
  +  XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  +  return &(data->xgv_namelen);
   }
   
   HV** Perl_macro_GvSTASH (pTHX_ GV *sv) {
  -  if(SvPMC(sv)) {
  -    XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  -    return &(data->xgv_stash);
  -  }
  -  return &((XPVGV*)SvANY(sv))->xgv_stash;
  +  XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  +  return &(data->xgv_stash);
   }
   
   U8* Perl_macro_GvFLAGS (pTHX_ GV *sv) {
  -  if(SvPMC(sv)) {
  -    XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  -    return &(data->xgv_flags);
  -  }
  -  return &((XPVGV*)SvANY(sv))->xgv_flags;
  +  XPVGV* data = (XPVGV*) /**/ SvANY(sv);
  +  return &(data->xgv_flags);
   }
   
   GV *
  
  
  
  1.67      +0 -4      ponie/perl/sv.c
  
  Index: sv.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/sv.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- sv.c	29 Apr 2005 22:11:31 -0000	1.66
  +++ sv.c	30 Apr 2005 08:11:43 -0000	1.67
  @@ -192,7 +192,6 @@
       SvREFCNT(sv) = 1;
       Parrot_PMC_set_intval_intkey(PL_Parrot,MUMBLE(sv),
   				 Ponie_I_SV_ZERO_FLAGS_SET_TYPE, 0);
  -    SvPMC_off(sv);
   #ifdef DEBUG_LEAKING_SCALARS
       /* FIXME */
       sv->sv_debug_optype = PL_op ? PL_op->op_type : 0;
  @@ -1796,21 +1795,18 @@
   void
   Perl_zero_xpvfm(pTHX_ SV *fm)
   {
  -  assert(SvPMC(fm));
     Zero(/**/ SvANY(fm), 1, XPVFM);
   }
   
   void
   Perl_zero_xpvio(pTHX_ SV *io)
   {
  -  assert(SvPMC(io));
     Zero(/**/ SvANY(io), 1, XPVIO);
   }
   
   void
   Perl_zero_xpvcv(pTHX_ SV *fm)
   {
  -  assert(SvPMC(fm));
     Zero(/**/ SvANY(fm), 1, XPVCV);
   }
   
  
  
  
  1.71      +0 -5      ponie/perl/sv.h
  
  Index: sv.h
  ===================================================================
  RCS file: /cvs/public/ponie/perl/sv.h,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- sv.h	29 Apr 2005 22:11:31 -0000	1.70
  +++ sv.h	30 Apr 2005 08:11:43 -0000	1.71
  @@ -142,11 +142,6 @@
   #  define SvFLAGS(sv)	((U32)Parrot_PMC_get_intval_intkey(PL_Parrot,MUMBLE(sv), Ponie_I_SV_FLAGS))
   #endif
   
  -#define SvPMC(sv)       1
  -#define SvPMC_on(sv)    ;
  -#define SvPMC_off(sv)   ;
  -
  -
   #if defined(__GNUC__) && !defined(__STRICT_ANSI__) && !defined(PERL_GCC_PEDANTIC)
   #  define SvREFCNT_inc(sv)		\
       ({					\
  
  
  
  1.12      +0 -1      ponie/perl/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/util.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- util.c	10 Apr 2005 04:17:49 -0000	1.11
  +++ util.c	30 Apr 2005 08:11:43 -0000	1.12
  @@ -877,7 +877,6 @@
   				 Ponie_I_SV_ZERO_FLAGS_SET_TYPE, SVt_PVMG);
       SvANY(sv) = /*(void*)MUMBLE(pvpvmg);*/ any;
       SvREFCNT(sv) = 1 << 30; /* practically infinite */
  -    SvPMC_on(sv);
       PL_mess_sv = sv;
       return sv;
   }