[extend] more Parrot_get_root_namespace cleanup

make headerizer.
parrot · Dec 5, 2014 · d31acc8 · d31acc8
1 parent 47186a0
commit d31acc8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/compilers/imcc/imc.h b/compilers/imcc/imc.h
@@ -392,7 +392,6 @@ void IMCC_push_parser_state(imc_info_t *info, STRING *filename, int is_file,
         int is_pasm);
 void IMCC_pop_parser_state(imc_info_t *info, void *yyscanner);
 
-/* globals store the state between individual e_pbc_emit calls */
 typedef struct subs_t {
     IMC_Unit      *unit;
     struct subs_t *prev;
@@ -416,6 +415,7 @@ typedef struct code_segment_t {
     SymHash                key_consts;    /* this seg's cached key constants */
 } code_segment_t;
 
+/* globals store the state between individual e_pbc_emit calls */
 typedef struct _imcc_globals_t {
     code_segment_t *cs;           /* current code segment */
     code_segment_t *first;        /* first code segment   */

diff --git a/compilers/imcc/pbc.c b/compilers/imcc/pbc.c
@@ -387,7 +387,7 @@ imcc_globals_destroy(SHIM_INTERP, SHIM(int ex), ARGMOD(void *param))
     ASSERT_ARGS(imcc_globals_destroy)
     imc_info_t * const imcc = (imc_info_t*)param;
 
-    /* This is an allowed condition? See TT #629 */
+    /* In an exit within :immediate there will no globals. See TT #629 */
     if (imcc->globals) {
         code_segment_t *cs = imcc->globals->cs;
 
@@ -408,7 +408,6 @@ imcc_globals_destroy(SHIM_INTERP, SHIM(int ex), ARGMOD(void *param))
         }
         imcc->globals->cs = NULL;
     }
-
 }
 
 

diff --git a/include/parrot/extend.h b/include/parrot/extend.h
@@ -74,10 +74,6 @@ void Parrot_ext_try(PARROT_INTERP,
     ARGIN_NULLOK(void *data))
         __attribute__nonnull__(1);
 
-PARROT_EXPORT
-Parrot_PMC Parrot_get_root_namespace(PARROT_INTERP)
-        __attribute__nonnull__(1);
-
 PARROT_EXPORT
 Parrot_Int Parrot_PMC_typenum(PARROT_INTERP,
     ARGIN_NULLOK(const char *_class))
@@ -93,8 +89,6 @@ Parrot_Int Parrot_PMC_typenum(PARROT_INTERP,
     , PARROT_ASSERT_ARG(signature))
 #define ASSERT_ARGS_Parrot_ext_try __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_get_root_namespace __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
-       PARROT_ASSERT_ARG(interp))
 #define ASSERT_ARGS_Parrot_PMC_typenum __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
        PARROT_ASSERT_ARG(interp))
 /* Don't modify between HEADERIZER BEGIN / HEADERIZER END.  Your changes will be lost. */

diff --git a/src/interp/api.c b/src/interp/api.c
@@ -450,13 +450,14 @@ Parrot_interp_really_destroy(PARROT_INTERP, SHIM(int exit_code), SHIM(void *arg)
 
     /*
      * now all objects that need timely destruction should be finalized
-     * so terminate the event loop
+     * so terminate the event loop.
      */
-  /*  if (!interp->parent_interpreter) {
+#if 0
+    if (!interp->parent_interpreter) {
         PIO_internal_shutdown(interp);
         Parrot_kill_event_loop(interp);
     }
-  */
+#endif
 
     /* we destroy all child interpreters and the last one too,
      * if the --leak-test commandline was given, and there is no