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

cvsuser     05/05/01 01:36:41

  Modified:    perl     sv.c sv.h util.c
  Log:
  Oops. This bit was "  Convert assignements to SvANY to SvANY_set"
  
  Revision  Changes    Path
  1.74      +4 -4      ponie/perl/sv.c
  
  Index: sv.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/sv.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- sv.c	1 May 2005 08:27:07 -0000	1.73
  +++ sv.c	1 May 2005 08:36:41 -0000	1.74
  @@ -188,7 +188,7 @@
       ptr_table_store(PL_sv_arenatable, sv, sv);
       ++PL_sv_count;
       UNLOCK_SV_MUTEX;
  -    SvANY(sv) = 0;
  +    SvANY_set(sv, 0);
       SvREFCNT(sv) = 1;
       Parrot_PMC_set_intval_intkey(PL_Parrot,MUMBLE(sv),
   				 Ponie_I_SV_ZERO_FLAGS_SET_TYPE, 0);
  @@ -251,7 +251,7 @@
         FREE_SV_DEBUG_FILE(p);
         /* Is the SV mutex needed outside 5005 threads?  */
         LOCK_SV_MUTEX;
  -      SvANY(p) = (void *)PL_sv_root;
  +      SvANY_set(p, (void *)PL_sv_root);
         PL_sv_root = (p);
         UNLOCK_SV_MUTEX;
       }
  @@ -5099,7 +5099,7 @@
       assert(!SvREFCNT(sv));
       SvREFCNT(sv) = SvREFCNT(nsv);
       SvFLAGS(sv) = SvFLAGS(nsv);
  -    SvANY(sv) = SvANY(nsv);
  +    SvANY_set(sv, SvANY(nsv));
       /* Because the SV data structure is rearranged */
       if (type == SVt_IV || type >= SVt_PVIV)
          SvIV_set(sv, SvIVX(nsv));
  @@ -7641,7 +7641,7 @@
   	SvREFCNT(rv) = 0;
   	/* FIXME. A downgrade upgrade.  */
   	sv_clear(rv);
  -	SvANY(rv) = 0;
  +	SvANY_set(rv, 0);
   	Parrot_PMC_set_pointer_intkey(PL_Parrot, MUMBLE(rv), Ponie_P_NEWRV_HACK,
   				      0);
   	SvFLAGS(rv) = 0;
  
  
  
  1.75      +6 -0      ponie/perl/sv.h
  
  Index: sv.h
  ===================================================================
  RCS file: /cvs/public/ponie/perl/sv.h,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- sv.h	1 May 2005 08:27:07 -0000	1.74
  +++ sv.h	1 May 2005 08:36:41 -0000	1.75
  @@ -131,7 +131,13 @@
   =cut
   */
   
  +#ifdef PERL_CORE
  +#define SvANY(sv)	(*Perl_macro_SvANY(aTHX_ (SV *) (sv)) + 0)
  +#define SvANY_set(sv, p)	(*Perl_macro_SvANY(aTHX_ (SV *) (sv)) = p)
  +#else
   #define SvANY(sv)	(*Perl_macro_SvANY(aTHX_ (SV *) (sv)))
  +#endif
  +
   #define SvREFCNT(sv)	(*Perl_macro_SvREFCNT(aTHX_ (SV *) (sv)))
   #if defined(PERL_CORE) && defined(PERL_IN_SV_C)
   /* sv.c will be replaced with PMC code to clone things etc, so little point
  
  
  
  1.13      +1 -1      ponie/perl/util.c
  
  Index: util.c
  ===================================================================
  RCS file: /cvs/public/ponie/perl/util.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- util.c	30 Apr 2005 08:11:43 -0000	1.12
  +++ util.c	1 May 2005 08:36:41 -0000	1.13
  @@ -875,7 +875,7 @@
       Newz(905, any, 1, XPVMG);
       Parrot_PMC_set_intval_intkey(PL_Parrot,MUMBLE(sv),
   				 Ponie_I_SV_ZERO_FLAGS_SET_TYPE, SVt_PVMG);
  -    SvANY(sv) = /*(void*)MUMBLE(pvpvmg);*/ any;
  +    SvANY_set(sv, any);
       SvREFCNT(sv) = 1 << 30; /* practically infinite */
       PL_mess_sv = sv;
       return sv;