Permalink
Browse files

More function renames, now stuck at PIR files

  • Loading branch information...
1 parent e85966a commit 86353cc9df183eda8cb24de64dcf874abadc3f32 @itsbilal itsbilal committed Dec 4, 2011
View
@@ -43,7 +43,7 @@ static PMC * get_compreg_pmc(PARROT_INTERP, int is_pasm, int add_compreg)
/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
/* HEADERIZER END: static */
-#define GET_RAW_INTERP(p) Parrot_int_get_interp_from_pmc(p)
+#define GET_RAW_INTERP(p) Parrot_interp_get_from_pmc(p)
#define GET_INTERP(p) (PMC_IS_NULL(p) ? NULL : GET_RAW_INTERP(p))
#define IMCC_API_CALLIN(p, i) \
@@ -142,7 +142,7 @@ get_compreg_pmc(PARROT_INTERP, int is_pasm, int add_compreg)
PMC * const comp = Parrot_pmc_new_init_int(interp, enum_class_IMCCompiler, is_pasm);
if (add_compreg) {
STRING * const name = VTABLE_get_string(interp, comp);
- Parrot_set_compiler(interp, name, comp);
+ Parrot_interp_set_compiler(interp, name, comp);
}
return comp;
}
@@ -262,7 +262,7 @@
.sub '__show_runtime_prefix_and_exit' :subid('WSubId_1') :anon
null $S1
- interpinfo $S1, 24
+ interpinfo ($S1, 24)
say $S1
exit 0
@@ -158,7 +158,7 @@ function __handle_error_and_exit[anon](var exception)
function __show_runtime_prefix_and_exit[anon]()
{
string runtime_prefix;
- ${ interpinfo runtime_prefix, INTERPINFO_RUNTIME_PREFIX };
+ ${ Parrot_interp_info (runtime_prefix, INTERPINFO_RUNTIME_PREFIX) };
say(runtime_prefix);
exit(0);
}
@@ -169,7 +169,7 @@ main(int argc, const char *argv[])
PDB_t *pdb;
const char *scriptname = NULL;
- interp = Parrot_new(NULL);
+ interp = Parrot_interp_new(NULL);
Parrot_debugger_init(interp);
pdb = interp->pdb;
@@ -205,7 +205,7 @@ main(int argc, const char *argv[])
Parrot_PackFile pf = Parrot_pf_get_packfile_pmc(interp, PackFile_new(interp, 0), str);
Parrot_pf_set_current_packfile(interp, pf);
- Parrot_compile_file(interp, str, 0);
+ Parrot_interp_compile_file(interp, str, 0);
/*if (errmsg)
Parrot_ex_throw_from_c_args(interp, NULL, 1, "Could not compile file");*/
View
@@ -328,10 +328,10 @@ main(int argc, const char **argv)
if (argc < 2)
help();
- interp = Parrot_new(NULL);
+ interp = Parrot_interp_new(NULL);
/* init and set top of stack */
- Parrot_init_stacktop(interp, &status);
+ Parrot_interp_init_stacktop(interp, &status);
while ((status = longopt_get(argc, argv, opt_options, &opt)) > 0) {
switch (opt.opt_id) {
@@ -803,7 +803,7 @@ main(int argc, const char **argv)
int i;
const char *output_file = NULL;
struct longopt_opt_info opt = LONGOPT_OPT_INFO_INIT;
- Interp * const interp = Parrot_new(NULL);
+ Interp * const interp = Parrot_interp_new(NULL);
STRING * pbcname = NULL;
PMC * pbcpmc = NULL;
@@ -343,7 +343,7 @@ void Parrot_interp_destroy(PARROT_INTERP)
__attribute__nonnull__(1);
PARROT_EXPORT
-void Parrot_init_stacktop(PARROT_INTERP, ARGIN(void *stack_top))
+void Parrot_interp_init_stacktop(PARROT_INTERP, ARGIN(void *stack_top))
__attribute__nonnull__(1)
__attribute__nonnull__(2);
@@ -365,7 +365,7 @@ void Parrot_interp_really_destroy(PARROT_INTERP, int exit_code, void *arg)
#define ASSERT_ARGS_Parrot_interp_make_interpreter __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
#define ASSERT_ARGS_Parrot_interp_destroy __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_init_stacktop __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_interp_init_stacktop __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp) \
, PARROT_ASSERT_ARG(stack_top))
#define ASSERT_ARGS_Parrot_interp_new __attribute__unused__ int _ASSERT_ARGS_CHECK = (0)
View
@@ -1106,7 +1106,7 @@ Parrot_debugger_init(PARROT_INTERP)
if (! interp->pdb) {
PDB_t *pdb = mem_gc_allocate_zeroed_typed(interp, PDB_t);
- Parrot_Interp debugger = Parrot_new(interp);
+ Parrot_Interp debugger = Parrot_interp_new(interp);
interp->pdb = pdb;
debugger->pdb = pdb;
pdb->debugee = interp;
@@ -3488,29 +3488,29 @@ PDB_info(PARROT_INTERP)
Parrot_Interp itp = interp->pdb ? interp->pdb->debugee : interp;
Parrot_io_eprintf(itdeb, "Total memory allocated: %ld\n",
- interpinfo(itp, TOTAL_MEM_ALLOC));
+ Parrot_interp_info(itp, TOTAL_MEM_ALLOC));
Parrot_io_eprintf(itdeb, "GC mark runs: %ld\n",
- interpinfo(itp, GC_MARK_RUNS));
+ Parrot_interp_info(itp, GC_MARK_RUNS));
Parrot_io_eprintf(itdeb, "Lazy gc mark runs: %ld\n",
- interpinfo(itp, GC_LAZY_MARK_RUNS));
+ Parrot_interp_info(itp, GC_LAZY_MARK_RUNS));
Parrot_io_eprintf(itdeb, "GC collect runs: %ld\n",
- interpinfo(itp, GC_COLLECT_RUNS));
+ Parrot_interp_info(itp, GC_COLLECT_RUNS));
Parrot_io_eprintf(itdeb, "Collect memory: %ld\n",
- interpinfo(itp, TOTAL_COPIED));
+ Parrot_interp_info(itp, TOTAL_COPIED));
Parrot_io_eprintf(itdeb, "Active PMCs: %ld\n",
- interpinfo(itp, ACTIVE_PMCS));
+ Parrot_interp_info(itp, ACTIVE_PMCS));
Parrot_io_eprintf(itdeb, "Timely GC PMCs: %ld\n",
- interpinfo(itp, IMPATIENT_PMCS));
+ Parrot_interp_info(itp, IMPATIENT_PMCS));
Parrot_io_eprintf(itdeb, "Total PMCs: %ld\n",
- interpinfo(itp, TOTAL_PMCS));
+ Parrot_interp_info(itp, TOTAL_PMCS));
Parrot_io_eprintf(itdeb, "Active buffers: %ld\n",
- interpinfo(itp, ACTIVE_BUFFERS));
+ Parrot_interp_info(itp, ACTIVE_BUFFERS));
Parrot_io_eprintf(itdeb, "Total buffers: %ld\n",
- interpinfo(itp, TOTAL_BUFFERS));
+ Parrot_interp_info(itp, TOTAL_BUFFERS));
Parrot_io_eprintf(itdeb, "Header allocations since last collect: %ld\n",
- interpinfo(itp, HEADER_ALLOCS_SINCE_COLLECT));
+ Parrot_interp_info(itp, HEADER_ALLOCS_SINCE_COLLECT));
Parrot_io_eprintf(itdeb, "Memory allocations since last collect: %ld\n",
- interpinfo(itp, MEM_ALLOCS_SINCE_COLLECT));
+ Parrot_interp_info(itp, MEM_ALLOCS_SINCE_COLLECT));
}
/*
View
@@ -127,7 +127,7 @@ Parrot_api_make_interpreter(Parrot_PMC parent, Parrot_Int flags,
Parrot_GC_Init_Args gc_args;
const Parrot_Interp parent_raw = PMC_IS_NULL(parent) ? NULL : GET_RAW_INTERP(parent);
Parrot_jump_buff env;
- interp_raw = allocate_interpreter(parent_raw, flags);
+ interp_raw = Parrot_interp_allocate_interpreter(parent_raw, flags);
if (setjmp(env)) {
interp_raw->api_jmp_buf = NULL;
*interp = NULL;
@@ -556,7 +556,7 @@ Parrot_api_get_compiler(Parrot_PMC interp_pmc, ARGIN(Parrot_String type),
{
ASSERT_ARGS(Parrot_api_get_compiler)
EMBED_API_CALLIN(interp_pmc, interp)
- *compiler = Parrot_get_compiler(interp, type);
+ *compiler = Parrot_interp_get_compiler(interp, type);
EMBED_API_CALLOUT(interp_pmc, interp);
}
Oops, something went wrong.

0 comments on commit 86353cc

Please sign in to comment.