[svn:parrot] r43349 - in branches/pmc_freeze_cleanup: include/parrot src src/pmc

[plobsing at svn.parrot.org]

Author: plobsing
Date: Thu Dec 31 21:17:41 2009
New Revision: 43349
URL: https://trac.parrot.org/parrot/changeset/43349

Log:
Thawing constants is a lie.

Modified:
   branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h
   branches/pmc_freeze_cleanup/src/hash.c
   branches/pmc_freeze_cleanup/src/pmc/orderedhash.pmc

Modified: branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h
==============================================================================
--- branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h	Thu Dec 31 20:37:41 2009	(r43348)
+++ branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h	Thu Dec 31 21:17:41 2009	(r43349)
@@ -19,9 +19,10 @@
 typedef enum {
     VISIT_FREEZE_NORMAL,
     VISIT_THAW_NORMAL,
-    VISIT_THAW_CONSTANTS,
 } visit_enum_type;
 
+#define VISIT_THAW_CONSTANTS VISIT_THAW_NORMAL
+
 struct _visit_info;
 typedef INTVAL   (*get_integer_f)   (PARROT_INTERP, struct _visit_info*);
 typedef void     (*push_integer_f)  (PARROT_INTERP, struct _visit_info*, INTVAL);
@@ -75,7 +76,6 @@
         VTABLE_push_pmc((interp), (visit), (pmc)); \
         break; \
       case VISIT_THAW_NORMAL: \
-      case VISIT_THAW_CONSTANTS: \
         (pmc) = VTABLE_shift_pmc((interp), (visit)); \
         break; \
     } \
@@ -89,7 +89,6 @@
         VTABLE_push_pmc((interp), (visit), _visit_pmc_attr); \
         break; \
       case VISIT_THAW_NORMAL: \
-      case VISIT_THAW_CONSTANTS: \
         _visit_pmc_attr = VTABLE_shift_pmc((interp), (visit)); \
         SETATTR_ ## pmclass ## _ ## attr_name((interp), (self), _visit_pmc_attr); \
         break; \

Modified: branches/pmc_freeze_cleanup/src/hash.c
==============================================================================
--- branches/pmc_freeze_cleanup/src/hash.c	Thu Dec 31 20:37:41 2009	(r43348)
+++ branches/pmc_freeze_cleanup/src/hash.c	Thu Dec 31 21:17:41 2009	(r43349)
@@ -681,7 +681,6 @@
 
     switch (VTABLE_get_integer(interp, info)) {
       case VISIT_THAW_NORMAL:
-      case VISIT_THAW_CONSTANTS:
         hash_thaw(interp, hash, info);
         break;
       case VISIT_FREEZE_NORMAL:

Modified: branches/pmc_freeze_cleanup/src/pmc/orderedhash.pmc
==============================================================================
--- branches/pmc_freeze_cleanup/src/pmc/orderedhash.pmc	Thu Dec 31 20:37:41 2009	(r43348)
+++ branches/pmc_freeze_cleanup/src/pmc/orderedhash.pmc	Thu Dec 31 21:17:41 2009	(r43349)
@@ -629,7 +629,6 @@
     VTABLE void visit(visit_info *info) {
         switch (VTABLE_get_integer(INTERP, info)) {
           case VISIT_THAW_NORMAL:
-          case VISIT_THAW_CONSTANTS:
             SUPER(info);
             break;