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

[plobsing at svn.parrot.org]

Author: plobsing
Date: Mon Dec 21 02:17:05 2009
New Revision: 43178
URL: https://trac.parrot.org/parrot/changeset/43178

Log:
remove non-functional general looking code

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

Modified: branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h
==============================================================================
--- branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h	Mon Dec 21 01:34:22 2009	(r43177)
+++ branches/pmc_freeze_cleanup/include/parrot/pmc_freeze.h	Mon Dec 21 02:17:05 2009	(r43178)
@@ -54,7 +54,6 @@
 
 typedef struct _visit_info {
     visit_f             visit_pmc_now;
-    visit_f             visit_action;   /* freeze, thaw ... */
     char               *pos;            /* current read/write position in buffer */
     Buffer             *buffer;
     size_t              input_length;   /* */

Modified: branches/pmc_freeze_cleanup/src/pmc_freeze.c
==============================================================================
--- branches/pmc_freeze_cleanup/src/pmc_freeze.c	Mon Dec 21 01:34:22 2009	(r43177)
+++ branches/pmc_freeze_cleanup/src/pmc_freeze.c	Mon Dec 21 02:17:05 2009	(r43178)
@@ -42,15 +42,6 @@
         FUNC_MODIFIES(*info);
 
 PARROT_INLINE
-static void do_action(PARROT_INTERP,
-    ARGIN_NULLOK(PMC *pmc),
-    ARGIN(visit_info *info),
-    int seen,
-    UINTVAL id)
-        __attribute__nonnull__(1)
-        __attribute__nonnull__(3);
-
-PARROT_INLINE
 static void do_thaw(PARROT_INTERP,
     ARGIN_NULLOK(PMC *pmc),
     ARGIN(visit_info *info))
@@ -171,7 +162,7 @@
         __attribute__nonnull__(1)
         __attribute__nonnull__(3);
 
-static void visit_todo_list(PARROT_INTERP,
+static void visit_todo_list_freeze(PARROT_INTERP,
     ARGIN_NULLOK(PMC* pmc),
     ARGIN(visit_info* info))
         __attribute__nonnull__(1)
@@ -186,9 +177,6 @@
 #define ASSERT_ARGS_create_buffer __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(info))
-#define ASSERT_ARGS_do_action __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp) \
-    , PARROT_ASSERT_ARG(info))
 #define ASSERT_ARGS_do_thaw __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(info))
@@ -245,7 +233,7 @@
 #define ASSERT_ARGS_visit_loop_todo_list __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(info))
-#define ASSERT_ARGS_visit_todo_list __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_visit_todo_list_freeze __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp) \
     , PARROT_ASSERT_ARG(info))
 #define ASSERT_ARGS_visit_todo_list_thaw __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
@@ -587,7 +575,6 @@
          16 - PACKFILE_HEADER_BYTES % 16 : 0);
 
     PackFile *pf = info->pf = PackFile_new(interp, 0);
-    info->visit_pmc_now   = visit_todo_list;
 
     /* we must use PMCs here so that they get marked properly */
     info->todo = pmc_new(interp, enum_class_Array);
@@ -751,39 +738,6 @@
 
 /*
 
-=item C<static void do_action(PARROT_INTERP, PMC *pmc, visit_info *info, int
-seen, UINTVAL id)>
-
-Called from C<visit_todo_list()> to perform the action specified in
-C<< info->what >>.
-
-Currently only C<VISIT_FREEZE_NORMAL> is implemented.
-
-=cut
-
-*/
-
-PARROT_INLINE
-static void
-do_action(PARROT_INTERP, ARGIN_NULLOK(PMC *pmc), ARGIN(visit_info *info),
-        int seen, UINTVAL id)
-{
-    ASSERT_ARGS(do_action)
-    switch (info->what) {
-      case VISIT_FREEZE_NORMAL:
-        freeze_pmc(interp, pmc, info, seen, id);
-        if (pmc)
-            info->visit_action = pmc->vtable->freeze;
-        break;
-      default:
-        Parrot_ex_throw_from_c_args(interp, NULL, 1, "Illegal action %ld",
-                (long)info->what);
-    }
-}
-
-
-/*
-
 =item C<static PMC* thaw_create_pmc(PARROT_INTERP, const visit_info *info,
 INTVAL type)>
 
@@ -945,7 +899,7 @@
 
 /*
 
-=item C<static void visit_todo_list(PARROT_INTERP, PMC* pmc, visit_info* info)>
+=item C<static void visit_todo_list_freeze(PARROT_INTERP, PMC* pmc, visit_info* info)>
 
 Checks the seen PMC via the todo list.
 
@@ -954,9 +908,9 @@
 */
 
 static void
-visit_todo_list(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info* info))
+visit_todo_list_freeze(PARROT_INTERP, ARGIN_NULLOK(PMC* pmc), ARGIN(visit_info* info))
 {
-    ASSERT_ARGS(visit_todo_list)
+    ASSERT_ARGS(visit_todo_list_freeze)
     int     seen;
     UINTVAL id = 0;
 
@@ -967,10 +921,10 @@
     else
         seen = todo_list_seen(interp, pmc, info, &id);
 
-    do_action(interp, pmc, info, seen, id);
+    freeze_pmc(interp, pmc, info, seen, id);
 
-    if (!seen)
-        (info->visit_action)(interp, pmc, info);
+    if (pmc && !seen)
+        VTABLE_freeze(interp, pmc, info);
 }
 
 
@@ -1152,10 +1106,10 @@
     }
 
     /* _NORMAL or _CONSTANTS */
-    info.what = what;
+    info.what          = what;
+    info.visit_pmc_now = visit_todo_list_thaw;
 
     todo_list_init(interp, &info, input);
-    info.visit_pmc_now   = visit_todo_list_thaw;
 
     info.thaw_result = NULL;
 
@@ -1205,7 +1159,8 @@
     visit_info info;
     STRING *result;
 
-    info.what = VISIT_FREEZE_NORMAL;
+    info.what          = VISIT_FREEZE_NORMAL;
+    info.visit_pmc_now = visit_todo_list_freeze;
     create_buffer(interp, pmc, &info);
     todo_list_init(interp, &info, STRINGNULL);