Permalink
Browse files

Rename functions yet again...

  • Loading branch information...
1 parent 489dd4b commit e85966a7fb5b4e4dda544ff515ee779f49170aef @itsbilal committed Dec 3, 2011
Showing with 201 additions and 201 deletions.
  1. +2 −2 include/parrot/interpreter.h
  2. +36 −36 include/parrot/oplib/core_ops.h
  3. +3 −3 src/embed/api.c
  4. +2 −2 src/exceptions.c
  5. +8 −8 src/interp/api.c
  6. +16 −16 src/ops/core.ops
  7. +134 −134 src/ops/core_ops.c
@@ -448,7 +448,7 @@ PMC* Parrot_interp_info_pmc(PARROT_INTERP, INTVAL what)
PARROT_EXPORT
PARROT_WARN_UNUSED_RESULT
PARROT_CANNOT_RETURN_NULL
-STRING* Parrot_interp_info_s(PARROT_INTERP, INTVAL what)
+STRING* Parrot_interp_info_string(PARROT_INTERP, INTVAL what)
__attribute__nonnull__(1);
PARROT_EXPORT
@@ -576,7 +576,7 @@ void register_nci_method(PARROT_INTERP,
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_interp_info_pmc __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
-#define ASSERT_ARGS_Parrot_interp_info_s __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
+#define ASSERT_ARGS_Parrot_interp_info_string __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
#define ASSERT_ARGS_Parrot_clear_debug __attribute__unused__ int _ASSERT_ARGS_CHECK = (\
PARROT_ASSERT_ARG(interp))
@@ -52,7 +52,7 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_tailcall_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_returncc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_capture_lex_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_newclosure_p_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_newclosure_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_args_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_get_params_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_set_returns_pc(opcode_t *, PARROT_INTERP);
@@ -98,12 +98,12 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_trace_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_gc_debug_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_gc_debug_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_i_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_i_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_p_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_p_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_s_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_interpinfo_s_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_i_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_i_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_pmc_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_pmc_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_string_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_info_string_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_warningson_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_warningson_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_warningsoff_i(opcode_t *, PARROT_INTERP);
@@ -142,8 +142,8 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_compreg_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_compreg_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_compreg_p_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_callback_p_p_p_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_callback_p_p_p_sc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_callback_p_p_p_s(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_callback_p_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_annotations_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_annotations_p_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_annotations_p_sc(opcode_t *, PARROT_INTERP);
@@ -566,10 +566,10 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_isa_i_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_isa_i_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_isa_i_p_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_newclass_p_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_newclass_p_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_newclass_p_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_newclass_p_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_newclass_p_s(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_newclass_p_sc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_newclass_p_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_newclass_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_subclass_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_subclass_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_subclass_p_p_s(opcode_t *, PARROT_INTERP);
@@ -620,18 +620,18 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_inspect_p_pc_s(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_inspect_p_p_sc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_inspect_p_pc_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_sc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_s_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_sc_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_s_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_sc_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_p_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_pc_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_p_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_pc_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_s(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_sc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_s_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_sc_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_s_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_sc_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_p_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_pc_p(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_p_pc(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_pc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_p_p(opcode_t *, PARROT_INTERP);
@@ -890,9 +890,9 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_sprintf_s_s_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_sprintf_s_sc_p(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_sprintf_p_p_p(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_s(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_s_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_s_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_s(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_s_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_s_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stringinfo_i_s_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stringinfo_i_sc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_stringinfo_i_s_ic(opcode_t *, PARROT_INTERP);
@@ -1107,14 +1107,14 @@ op_lib_t *Parrot_DynOp_core_3_10_0(PARROT_INTERP, long init);
opcode_t * Parrot_vivify_p_pc_s_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_vivify_p_p_sc_pc(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_vivify_p_pc_sc_pc(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_s_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_sc_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_s_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_sc_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_p_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_pc_i(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_p_ic(opcode_t *, PARROT_INTERP);
- opcode_t * Parrot_new_p_pc_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_s_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_sc_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_s_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_sc_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_p_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_pc_i(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_p_ic(opcode_t *, PARROT_INTERP);
+ opcode_t * Parrot_interp_new_p_pc_ic(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_p_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_pc_i(opcode_t *, PARROT_INTERP);
opcode_t * Parrot_root_new_p_p_ic(opcode_t *, PARROT_INTERP);
View
@@ -150,7 +150,7 @@ Parrot_api_make_interpreter(Parrot_PMC parent, Parrot_Int flags,
memset(&gc_args, 0, sizeof (Parrot_GC_Init_Args));
gc_args.stacktop = &alt_stacktop;
}
- initialize_interpreter(interp_raw, &gc_args);
+ Parrot_interp_initialize_interpreter(interp_raw, &gc_args);
*interp = VTABLE_get_pmc_keyed_int(
interp_raw, interp_raw->iglobals, (Parrot_Int)IGLOBALS_INTERPRETER);
}
@@ -317,7 +317,7 @@ Parrot_api_destroy_interpreter(Parrot_PMC interp_pmc)
if (_oldtop == NULL)
interp->lo_var_ptr = &_oldtop;
interp->api_jmp_buf = &env;
- Parrot_destroy(interp);
+ Parrot_interp_destroy(interp);
Parrot_x_exit(interp, 0);
/* Never reached, x_exit calls longjmp */
return 1;
@@ -579,7 +579,7 @@ Parrot_api_set_compiler(Parrot_PMC interp_pmc, ARGIN(Parrot_String type),
{
ASSERT_ARGS(Parrot_api_set_compiler)
EMBED_API_CALLIN(interp_pmc, interp)
- Parrot_set_compiler(interp, type, compiler);
+ Parrot_interp_set_compiler(interp, type, compiler);
EMBED_API_CALLOUT(interp_pmc, interp)
}
View
@@ -575,7 +575,7 @@ Parrot_print_backtrace(void)
# ifndef PARROT_HAS_DLINFO
# define BACKTRACE_VERBOSE
# endif
- Interp *emergency_interp = Parrot_get_emergency_interp();
+ Interp *emergency_interp = Parrot_interp_get_emergency_interpreter();
/* stolen from http://www.delorie.com/gnu/docs/glibc/libc_665.html */
void *array[BACKTRACE_DEPTH];
int i;
@@ -616,7 +616,7 @@ Parrot_print_backtrace(void)
# endif
fprintf(stderr, "Attempting to get PIR backtrace. No guarantees. Here goes...\n");
if (emergency_interp) {
- Parrot_clear_emergency_interp();
+ Parrot_interp_clear_emergency_interpreter();
PDB_backtrace(emergency_interp);
}
# undef BACKTRACE_DEPTH
View
@@ -160,7 +160,7 @@ initialized. Used in next cycle:
allocate_interpreter
parseflags
- initialize_interpreter
+ Parrot_interp_initialize_interpreter
for overriding subsystems (e.g. GC) which require early initialization.
@@ -335,7 +335,7 @@ Parrot_interp_initialize_interpreter(PARROT_INTERP, ARGIN(Parrot_GC_Init_Args *a
* Threaded interpreters are destructed when the thread ends
*/
if (!Interp_flags_TEST(interp, PARROT_IS_THREAD))
- Parrot_x_on_exit(interp, Parrot_really_destroy, NULL);
+ Parrot_x_on_exit(interp, Parrot_interp_really_destroy, NULL);
#endif
return interp;
@@ -362,7 +362,7 @@ Parrot_interp_destroy(PARROT_INTERP)
#ifdef ATEXIT_DESTROY
UNUSED(interp);
#else
- Parrot_really_destroy(interp, 0);
+ Parrot_interp_really_destroy(interp, 0);
#endif
}
@@ -388,7 +388,7 @@ Parrot_interp_really_destroy(PARROT_INTERP, int exit_code, SHIM(void *arg))
/* Don't bother trying to provide a pir backtrace on assertion failures
* during global destruction. It only works in movies. */
- Parrot_clear_emergency_interp();
+ Parrot_interp_clear_emergency_interpreter();
}
/* if something needs destruction (e.g. closing PIOs)
@@ -729,7 +729,7 @@ const char *code, Parrot_String *error)>
Compiles a code string.
-DEPRECATED: Use Parrot_compile_file (or whatever replaces it, TT #2135).
+DEPRECATED: UseParrot_interp_compile_file (or whatever replaces it, TT #2135).
=cut
@@ -834,7 +834,7 @@ Parrot_interp_info(PARROT_INTERP, INTVAL what)
default: /* or a warning only? */
ret = -1;
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
- "illegal argument in interpinfo");
+ "illegal argument in Parrot_interp_info");
}
return ret;
}
@@ -880,7 +880,7 @@ Parrot_interp_info_pmc(PARROT_INTERP, INTVAL what)
break;
default: /* or a warning only? */
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
- "illegal argument in interpinfo");
+ "illegal argument in Parrot_interp_info");
}
/* Don't send NULL values to P registers */
@@ -953,7 +953,7 @@ Parrot_interp_info_string(PARROT_INTERP, INTVAL what)
return interp->run_core->name;
default:
Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_UNIMPLEMENTED,
- "illegal argument in interpinfo");
+ "illegal argument in Parrot_interp_info");
}
}
View
@@ -963,7 +963,7 @@ If $1 is zero, turn off byte code bounds checking. Otherwise turn it on.
=cut
inline op bounds(in INT) :flow {
- if ($1 != 0) { Parrot_set_flag(interp, PARROT_BOUNDS_FLAG); }
+ if ($1 != 0) { Parrot_interp_set_flag(interp, PARROT_BOUNDS_FLAG); }
else { Interp_flags_CLEAR(interp, PARROT_BOUNDS_FLAG); }
restart NEXT();
}
@@ -978,7 +978,7 @@ If $1 is zero, turn off profiling. Otherwise turn it on.
=cut
inline op profile(in INT) :flow {
- if ($1 != 0) { Parrot_set_flag(interp, PARROT_PROFILE_FLAG); }
+ if ($1 != 0) { Parrot_interp_set_flag(interp, PARROT_PROFILE_FLAG); }
else { Interp_flags_CLEAR(interp, PARROT_PROFILE_FLAG); }
restart NEXT();
}
@@ -993,8 +993,8 @@ If $1 is zero, turn off tracing. Otherwise turn trace flag $1 on.
=cut
inline op trace(in INT) :flow {
- if ($1 != 0) { Parrot_set_trace(interp, $1); }
- else { Parrot_clear_trace(interp, PARROT_ALL_TRACE_FLAGS); }
+ if ($1 != 0) { Parrot_interp_set_trace(interp, $1); }
+ else { Parrot_interp_clear_trace(interp, PARROT_ALL_TRACE_FLAGS); }
restart NEXT();
}
@@ -1013,44 +1013,44 @@ inline op gc_debug(in INT) {
########################################
-=item B<interpinfo>
+=item B<Parrot_interp_info>
Fetch some piece of information about the interpreter and put it in $1.
-Possible values for $2 are defined in F<runtime/parrot/include/interpinfo.pasm>.
+Possible values for $2 are defined in F<runtime/parrot/include/Parrot_interp_info.pasm>.
The valid constants for each return value are (excluding the .INTERPINFO_
prefix):
=over 4
-=item B<interpinfo>(out INT, in INT)
+=item B<Parrot_interp_info>(out INT, in INT)
TOTAL_MEM_ALLOC, TOTAL_MEM_USED, GC_MARK_RUNS, GC_COLLECT_RUNS, ACTIVE_PMCS,
ACTIVE_BUFFERS, TOTAL_PMCS, TOTAL_BUFFERS, HEADER_ALLOCS_SINCE_COLLECT,
MEM_ALLOCS_SINCE_COLLECT, TOTAL_COPIED, IMPATIENT_PMCS, GC_LAZY_MARK_RUNS,
EXTENDED_PMCS, CURRENT_RUNCORE
-=item B<interpinfo>(out PMC, in INT)
+=item B<Parrot_interp_info>(out PMC, in INT)
CURRENT_SUB, CURRENT_CONT, CURRENT_OBJECT, CURRENT_LEXPAD
-=item B<interpinfo>(out STR, in INT)
+=item B<Parrot_interp_info>(out STR, in INT)
EXECUTABLE_FULLNAME, EXECUTABLE_BASENAME, RUNTIME_PREFIX, CURRENT_RUNCORE
=back
=cut
-op interpinfo(out INT, in INT) {
- $1 = interpinfo(interp, $2);
+op Parrot_interp_info(out INT, in INT) {
+ $1 = Parrot_interp_info(interp, $2);
}
-op interpinfo(out PMC, in INT) {
- $1 = interpinfo_p(interp, $2);
+op Parrot_interp_info(out PMC, in INT) {
+ $1 = Parrot_interp_info_pmc(interp, $2);
}
-op interpinfo(out STR, in INT) {
- STRING * const s = interpinfo_s(interp, $2);
+op Parrot_interp_info(out STR, in INT) {
+ STRING * const s = Parrot_interp_info_string(interp, $2);
$1 = s;
}
@@ -1134,7 +1134,7 @@ inline op errorsoff(in INT) {
Switch the current runcore to the one with the specified name.
Needs to be an op, as we need to restart the runops() call.
-You can get the name of the current runcore with the interpinfo op.
+You can get the name of the current runcore with the Parrot_interp_info op.
=cut
Oops, something went wrong.

0 comments on commit e85966a

Please sign in to comment.