Index: compilers/imcc/reg_alloc.c =================================================================== --- compilers/imcc/reg_alloc.c (revision 34727) +++ compilers/imcc/reg_alloc.c (working copy) @@ -59,7 +59,7 @@ __attribute__nonnull__(2) FUNC_MODIFIES(*unit); -static void build_reglist(Parrot_Interp interp, ARGMOD(IMC_Unit *unit)) +static void build_reglist(NULLOK_INTERP, ARGMOD(IMC_Unit *unit)) __attribute__nonnull__(2) FUNC_MODIFIES(*unit); @@ -634,7 +634,7 @@ */ static void -build_reglist(Parrot_Interp interp, ARGMOD(IMC_Unit *unit)) +build_reglist(NULLOK_INTERP, ARGMOD(IMC_Unit *unit)) { SymHash const *hsh = &unit->hash; unsigned int i, count, unused, n_symbols; Index: config/gen/platform/ansi/exec.c =================================================================== --- config/gen/platform/ansi/exec.c (revision 34727) +++ config/gen/platform/ansi/exec.c (working copy) @@ -23,7 +23,7 @@ /* -=item C +=item C Spawn a subprocess @@ -32,7 +32,7 @@ */ INTVAL -Parrot_Run_OS_Command(Parrot_Interp interp, STRING *command) +Parrot_Run_OS_Command(PARROT_INTERP, STRING *command) { Parrot_warn(NULL, PARROT_WARNINGS_PLATFORM_FLAG, "Parrot_Run_OS_Command not implemented"); @@ -41,7 +41,7 @@ /* -=item C +=item C RT#48260: Not yet documented!!! @@ -50,7 +50,7 @@ */ INTVAL -Parrot_Run_OS_Command_Argv(Parrot_Interp interp, PMC *cmdargs) +Parrot_Run_OS_Command_Argv(PARROT_INTERP, PMC *cmdargs) { Parrot_warn(NULL, PARROT_WARNINGS_PLATFORM_FLAG, "Parrot_Run_OS_Command_Argv not implemented"); @@ -59,7 +59,7 @@ /* -=item C +=item C RT#48260: Not yet documented!!! @@ -68,7 +68,7 @@ */ void -Parrot_Exec_OS_Comman(Parrot_Interp interp, STRING *command) +Parrot_Exec_OS_Comman(PARROT_INTERP, STRING *command) { Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_NOSPAWN, "Exec not implemented"); Index: config/gen/platform/generic/exec.c =================================================================== --- config/gen/platform/generic/exec.c (revision 34727) +++ config/gen/platform/generic/exec.c (working copy) @@ -27,7 +27,7 @@ /* =item C +Parrot_Run_OS_Command(PARROT_INTERP, STRING *command)> Spawn off a subprocess and wait for the damn thing to complete, returning the return value of the process @@ -37,7 +37,7 @@ */ INTVAL -Parrot_Run_OS_Command(Parrot_Interp interp, STRING *command) +Parrot_Run_OS_Command(PARROT_INTERP, STRING *command) { pid_t child; child = fork(); @@ -72,7 +72,7 @@ /* =item C +Parrot_Run_OS_Command_Argv(PARROT_INTERP, PMC *cmdargs)> RT#48260: Not yet documented!!! @@ -81,7 +81,7 @@ */ INTVAL -Parrot_Run_OS_Command_Argv(Parrot_Interp interp, PMC *cmdargs) +Parrot_Run_OS_Command_Argv(PARROT_INTERP, PMC *cmdargs) { pid_t child; int len = VTABLE_elements(interp, cmdargs); @@ -133,7 +133,7 @@ /* =item C +Parrot_Exec_OS_Command(PARROT_INTERP, STRING *command)> RT #48260: Not yet documented!!! @@ -142,7 +142,7 @@ */ void -Parrot_Exec_OS_Command(Parrot_Interp interp, STRING *command) +Parrot_Exec_OS_Command(PARROT_INTERP, STRING *command) { /* Be horribly profligate with memory, since we're about to be something else */ Index: config/gen/platform/win32/exec.c =================================================================== --- config/gen/platform/win32/exec.c (revision 34727) +++ config/gen/platform/win32/exec.c (working copy) @@ -26,7 +26,7 @@ /* =item C +Parrot_Run_OS_Command(PARROT_INTERP, STRING *command)> Spawn the subprocess specified in C. Waits for the process to complete, and then @@ -37,7 +37,7 @@ */ INTVAL -Parrot_Run_OS_Command(Parrot_Interp interp, STRING *command) +Parrot_Run_OS_Command(PARROT_INTERP, STRING *command) { DWORD status = 0; STARTUPINFO si; @@ -79,7 +79,7 @@ /* =item C +Parrot_Run_OS_Command_Argv(PARROT_INTERP, PMC *cmdargs)> Spawns a subprocess with the arguments provided in the C PMC array. The first array element should be the name of the process to spawn, @@ -92,7 +92,7 @@ */ INTVAL -Parrot_Run_OS_Command_Argv(Parrot_Interp interp, PMC *cmdargs) +Parrot_Run_OS_Command_Argv(PARROT_INTERP, PMC *cmdargs) { DWORD status = 0; STARTUPINFO si; @@ -152,7 +152,7 @@ /* =item C +Parrot_Exec_OS_Command(PARROT_INTERP, STRING *command)> Exits parrot and passes control to the specified process. Does not return. Raises an exception if the exec fails. @@ -162,7 +162,7 @@ */ void -Parrot_Exec_OS_Command(Parrot_Interp interp, STRING *command) +Parrot_Exec_OS_Command(PARROT_INTERP, STRING *command) { int status; char *in = string_to_cstring(interp, command); Index: docs/book/ch13_reference.pod =================================================================== --- docs/book/ch13_reference.pod (revision 34727) +++ docs/book/ch13_reference.pod (working copy) @@ -4,7 +4,7 @@ Z -This chapter contains a condensed list of PASM opcodes, PIR directives +This chapter contains a condensed list of PASM opcodes, PIR directives and instructions, and Parrot command-line options, sorted alphabetically for easy reference. Any PASM opcode is valid in PIR code, so if you're looking up PIR syntax you should check A"PASM Opcodes", Index: docs/dev/fhs.pod =================================================================== --- docs/dev/fhs.pod (revision 34727) +++ docs/dev/fhs.pod (working copy) @@ -5,7 +5,7 @@ =head1 Title -FHS - Filesystem Hieararchy Standard and Parrot +FHS - Filesystem Hierarchy Standard and Parrot =head1 AUTHOR Index: docs/embed.pod =================================================================== --- docs/embed.pod (revision 34727) +++ docs/embed.pod (working copy) @@ -117,7 +117,7 @@ process should use the first interpreter as their parent. Failure to do so may result in unpredictable errors. -=item C +=item C Sets or unsets interpreter flags. Flags should be OR'd together. Valid flags include: @@ -151,7 +151,7 @@ See F for the definition of these flags (TODO: document flag definitions here). -=item C +=item C Sets the runcore for the interpreter. Must be called before executing any bytecode. Valid runcores include: @@ -207,35 +207,35 @@ =back -=item C +=item C Sets the executable name of the calling process. Note that the name is a Parrot string, not a C string. -=item C +=item C Destroys an interpreter. At the time of this writing, this is a no-op. See . -=item C +=item C Destroys an interpreter, regardless of the environment. The exit code is currently unused. -=item C +=item C Destroys the interpreter and exits with an exit code of C. Before exiting, the function calls all registered exit handlers in LIFO order. C is usually called as the last exit handler. -=item C Registers an exit handler to be called from C in LIFO order. The handler function should accept as arguments an interpreter, an integer exit code, and an argument (which can be NULL). -=item C +=item C Initializes the IMCC subsystem. Required for compiling PIR. @@ -245,27 +245,27 @@ =over 4 -=item C +=item C Reads Parrot bytecode or PIR from the file referenced by C. Returns a packfile structure for use by C. -=item C +=item C Loads a packfile into the interpreter. After this operation the interpreter is ready to run the bytecode in the packfile. -=item C +=item C Runs the bytecode associated with the interpreter. Use C and C to pass arguments to the bytecode. -=item C +=item C Creates a "dummy" packfile in lieu of actually creating one from a bytecode file on disk. -=item C +=item C Reads and load Parrot bytecode or PIR from the file referenced by C. You should create a dummy packfile beforehand; see C for @@ -280,22 +280,22 @@ =over 4 -=item C +=item C Returns the internal type number corresponding to C. Useful for instantiating various Parrot data types. -=item C +=item C XXX needs to be a formal Parrot_* API. Returns the C string representation of a Parrot string. -=item C +=item C XXX needs to be a formal Parrot_* API. Returns the Parrot string representation of a C string. -=item C +=item C XXX needs to be a formal Parrot_* API. A macro for simplifying calls to C. @@ -306,7 +306,7 @@ =over 4 -=item C +=item C Creates a new PMC of the type identified by C. Use C to obtain the correct type number. @@ -329,40 +329,40 @@ =over 4 -=item C +=item C Find and return a global called C in the current namespace. Returns C if not found. -=item C +=item C Not documented yet. -=item C +=item C Find and return a global called C in the namespace C. Returns C if not found. -=item C +=item C Sets the value of a global called C in the current namespace. Does nothing if the global is not found. -=item C +=item C Not documented yet. -=item C +=item C Sets the value of a global called C in the namespace C. Does nothing if the global is not found. -=item C +=item C Find and return a global called C in the keyed namespace C. Returns C if not found. -=item C +=item C Sets the value of a global called C in the keyed namespace C. Does nothing if the global is not found. @@ -377,15 +377,15 @@ =over 4 -=item C +=item C Call a Parrot subroutine that returns a pointer using the supplied signature. -=item C +=item C Call a Parrot subroutine that returns an integer using the supplied signature. -=item C +=item C Call a Parrot subroutine that returns an float using the supplied signature. @@ -397,11 +397,11 @@ =over 4 -=item C +=item C Returns the class corresponding to the supplied namespace. -=item C +=item C Instantiates a new object of class C, which can be obtained from C. Passes an optional PMC argument C to the Index: docs/extend.pod =================================================================== --- docs/extend.pod (revision 34727) +++ docs/extend.pod (working copy) @@ -36,7 +36,7 @@ =over 4 -=item C Calls a method on C with the given signature and arguments. C is Index: docs/tests.pod =================================================================== --- docs/tests.pod (revision 34727) +++ docs/tests.pod (working copy) @@ -115,7 +115,7 @@ } static opcode_t* - the_test(Parrot_Interp interp, + the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start) { /* Your test goes here. */ Index: examples/c/test_main.c =================================================================== --- examples/c/test_main.c (revision 34727) +++ examples/c/test_main.c (working copy) @@ -28,7 +28,7 @@ #define setopt(flag) Parrot_setflag(interp, (flag), (*argv)[0]+2); #define unsetopt(flag) Parrot_setflag(interp, (flag), 0) -static char *parseflags(Parrot_Interp interp, int *argc, char **argv[]); +static char *parseflags(PARROT_INTERP, int *argc, char **argv[]); #define OPT_GC_DEBUG 128 #define OPT_DESTROY_FLAG 129 @@ -97,7 +97,7 @@ /* =item C +parseflags(PARROT_INTERP, int *argc, char **argv[])> Parses the command-line. @@ -106,7 +106,7 @@ */ static char * -parseflags(Parrot_Interp interp, int *argc, char **argv[]) +parseflags(PARROT_INTERP, int *argc, char **argv[]) { struct longopt_opt_info opt = LONGOPT_OPT_INFO_INIT; Index: examples/compilers/japhc.c =================================================================== --- examples/compilers/japhc.c (revision 34727) +++ examples/compilers/japhc.c (working copy) @@ -40,12 +40,12 @@ # define cdebug(x) #endif -PMC* japh_compiler(Parrot_Interp interp, const char *s); +PMC* japh_compiler(PARROT_INTERP, const char *s); /* =item C +Parrot_lib_japhc_init(PARROT_INTERP, PMC* lib)> loadlib calls the load and init hooks we use init to register the compiler @@ -55,7 +55,7 @@ */ void -Parrot_lib_japhc_init(Parrot_Interp interp, PMC* lib) +Parrot_lib_japhc_init(PARROT_INTERP, PMC* lib) { STRING *cmp; @@ -102,7 +102,7 @@ /* =item C +add_const_str(PARROT_INTERP, PackFile_ConstTable *consts, char *str)> add constant string to constant_table @@ -111,7 +111,7 @@ */ static int -add_const_str(Parrot_Interp interp, PackFile_ConstTable *consts, char *str) +add_const_str(PARROT_INTERP, PackFile_ConstTable *consts, char *str) { int k, l; char *o; @@ -156,7 +156,7 @@ /* -=item C +=item C simple compiler - no error checking @@ -165,7 +165,7 @@ */ PMC* -japh_compiler(Parrot_Interp interp, const char *program) +japh_compiler(PARROT_INTERP, const char *program) { PackFile_ByteCode *cur_cs, *old_cs; PackFile_ConstTable *consts; Index: ext/Parrot-Embed/lib/Parrot/Embed.xs =================================================================== --- ext/Parrot-Embed/lib/Parrot/Embed.xs (revision 34727) +++ ext/Parrot-Embed/lib/Parrot/Embed.xs (working copy) @@ -23,7 +23,7 @@ } PMC_struct; Interpreter_struct* -make_interp( pTHX_ SV *parent, Parrot_Interp interp ) +make_interp( pTHX_ SV *parent, PARROT_INTERP ) { Interpreter_struct *interp_struct; if (interp == NULL) Index: include/parrot/embed.h =================================================================== --- include/parrot/embed.h (revision 34727) +++ include/parrot/embed.h (working copy) @@ -64,7 +64,7 @@ PARROT_DOES_NOT_RETURN void Parrot_exit(Parrot_Interp, int status); -PARROT_EXPORT void Parrot_run_native(Parrot_Interp interp, native_func_t func); +PARROT_EXPORT void Parrot_run_native(PARROT_INTERP, native_func_t func); /* Parrot_set_config_hash exists in *_config.o (e.g install_config.o), so if you make this call then you will need to link with it in Index: include/parrot/interpreter.h =================================================================== --- include/parrot/interpreter.h (revision 34727) +++ include/parrot/interpreter.h (working copy) @@ -92,8 +92,7 @@ PARROT_CLONE_CC = 0x80, /* clone current continuation -- * fork()-like cloning (requires * cloned code segments); probably - * would only work if runloop_level is 1 - */ + * would only work if runloop_level is 1 */ /* combinations of flags */ PARROT_CLONE_DEFAULT = 0x7f /* everything but CC */ @@ -101,10 +100,9 @@ /* &end_gen */ struct parrot_interp_t; -/* One of the most common shim arguments is the interpreter itself, so it - * gets its own macro. - */ +/* One of the most common shim arguments is the interpreter itself, so it + * gets its own macro. */ #define PARROT_INTERP /*@notnull@*/ /*@in@*/ Parrot_Interp interp #define NULLOK_INTERP /*@null@*/ /*@in@*/ Parrot_Interp interp #define SHIM_INTERP /*@unused@*/ /*@null@*/ Parrot_Interp interp_unused __attribute__unused__ @@ -151,10 +149,8 @@ Warnings_classes classes; } *Warnings; -/* - * ProfData have these extra items in front followed by - * one entry per op at (op + extra) - */ +/* ProfData have these extra items in front followed by + * one entry per op at (op + extra) */ typedef enum { PARROT_PROF_DOD_p1, /* pass 1 mark root set */ @@ -167,9 +163,7 @@ PARROT_PROF_EXTRA } profile_extra_enum; -/* - * data[op_count] is time spent for exception handling - */ +/* data[op_count] is time spent for exception handling */ typedef struct ProfData { int op; UINTVAL numcalls; @@ -184,8 +178,7 @@ } RunProfile; /* Forward declaration for imc_info_t -- the actual struct is - * defined in imcc/imc.h - */ + * defined in imcc/imc.h */ struct _imc_info_t; typedef union { @@ -210,6 +203,7 @@ struct Parrot_Context *caller_ctx; /* caller context */ Regs_ni bp; /* pointers to FLOATVAL & INTVAL */ Regs_ps bp_ps; /* pointers to PMC & STR */ + /* end common header */ INTVAL *n_regs_used; /* INSP in PBC points to Sub */ size_t regs_mem_size; /* memory occupied by registers */ @@ -223,13 +217,11 @@ UINTVAL errors; /* fatals that can be turned off */ UINTVAL trace_flags; UINTVAL recursion_depth; /* Sub call recursion depth */ - /* - * new call scheme and introspective variables - */ + + /* new call scheme and introspective variables */ PMC *current_sub; /* the Sub we are executing */ - /* - * for now use a return continuation PMC - */ + + /* for now use a return continuation PMC */ PMC *current_cont; /* the return continuation PMC */ PMC *current_object; /* current object if a method call */ opcode_t *current_pc; /* program counter of Sub invocation */ @@ -240,9 +232,9 @@ PMC *handlers; /* local handlers for the context */ /* deref the constants - we need it all the time */ struct PackFile_Constant ** constants; + /* code->prederefed.code - code->base.data in opcodes - * to simplify conversio between code ptrs in e.g. invoke - */ + * to simplify conversio between code ptrs in e.g. invoke */ size_t pred_offset; }; @@ -298,7 +290,7 @@ * used to resume execution at a point in the runloop where an exception * handler can be run. Ultimately this information should be part of * Parrot_Context, but at this point a new context isn't created for every - * runloop ID, so it still needs to be a separate stack for a while longer.*/ + * runloop ID, so it still needs to be a separate stack for a while longer. */ typedef struct parrot_runloop_t { Parrot_jump_buff resume; /* jmp_buf */ @@ -508,7 +500,7 @@ VAR_SCOPE native_func_t run_native; -typedef PMC *(*Parrot_compiler_func_t)(Parrot_Interp interp, +typedef PMC *(*Parrot_compiler_func_t)(PARROT_INTERP, const char * program); /* HEADERIZER BEGIN: src/inter_create.c */ @@ -957,7 +949,7 @@ /* interpreter.pmc */ void clone_interpreter(Parrot_Interp dest, Parrot_Interp self, INTVAL flags); -void Parrot_setup_event_func_ptrs(Parrot_Interp interp); +void Parrot_setup_event_func_ptrs(PARROT_INTERP); PARROT_EXPORT void disable_event_checking(PARROT_INTERP); PARROT_EXPORT void enable_event_checking(PARROT_INTERP); @@ -973,7 +965,7 @@ struct Parrot_Interp_; typedef struct Parrot_Interp_ *Parrot_Interp; -typedef void * *(*native_func_t)(Parrot_Interp interp, +typedef void * *(*native_func_t)(PARROT_INTERP, void *cur_opcode, void *start_code); Index: languages/dotnet/ops/dotnet.ops =================================================================== --- languages/dotnet/ops/dotnet.ops (revision 34727) +++ languages/dotnet/ops/dotnet.ops (working copy) @@ -83,7 +83,7 @@ /* Overflow exception thrower. */ -static opcode_t* dotnet_OverflowException(Parrot_Interp interp, opcode_t *ret) +static opcode_t* dotnet_OverflowException(PARROT_INTERP, opcode_t *ret) { PMC *ex_pmc = pmc_new(interp, enum_class_Exception); VTABLE_set_string_native(interp, ex_pmc, Index: src/parrot_debugger.c =================================================================== --- src/parrot_debugger.c (revision 34727) +++ src/parrot_debugger.c (working copy) @@ -115,7 +115,7 @@ #include "parrot/debugger.h" static void PDB_printwelcome(void); -static void PDB_run_code(Parrot_Interp interp, int argc, char *argv[]); +static void PDB_run_code(PARROT_INTERP, int argc, char *argv[]); /* @@ -249,7 +249,7 @@ */ static void -PDB_run_code(Parrot_Interp interp, int argc, char *argv[]) +PDB_run_code(PARROT_INTERP, int argc, char *argv[]) { new_runloop_jump_point(interp); if (setjmp(interp->current_runloop->resume)) { Index: src/pbc_disassemble.c =================================================================== --- src/pbc_disassemble.c (revision 34727) +++ src/pbc_disassemble.c (working copy) @@ -82,7 +82,7 @@ /* -=item C +=item C Do the disassembling. @@ -91,7 +91,7 @@ */ static void -do_dis(Parrot_Interp interp) +do_dis(PARROT_INTERP) { Parrot_disassemble(interp); } Index: src/pmc/parrotinterpreter.pmc =================================================================== --- src/pmc/parrotinterpreter.pmc (revision 34727) +++ src/pmc/parrotinterpreter.pmc (working copy) @@ -170,7 +170,7 @@ } static int -recursion_limit(Parrot_Interp interp, PMC *self, int l) +recursion_limit(PARROT_INTERP, PMC *self, int l) { const int ret = interp->recursion_limit; interp->recursion_limit = l; Index: t/src/basic.t =================================================================== --- t/src/basic.t (revision 34727) +++ t/src/basic.t (working copy) @@ -6,10 +6,8 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; -use Parrot::Test; +use Parrot::Test tests => 3; -plan tests => 3; - =head1 NAME t/src/basic.t - Basics Index: t/src/compiler.t =================================================================== --- t/src/compiler.t (revision 34727) +++ t/src/compiler.t (working copy) @@ -6,12 +6,8 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; -use Parrot::Test; +use Parrot::Test tests => 5; -$^O eq 'MSWin32' - ? plan( skip_all => 'linking problem' ) - : plan( tests => 5 ); - =head1 NAME t/src/compiler.t - Compile and run a PIR program from C. @@ -35,7 +31,7 @@ #include "parrot/extend.h" static opcode_t * -run(Parrot_Interp interp, int argc, char *argv[]) +run(PARROT_INTERP, int argc, char *argv[]) { const char *c_src = ".sub main :main\n" " print \"ok\\n\"\n" ".end\n"; @@ -117,7 +113,7 @@ #include "parrot/extend.h" static void -compile_run(Parrot_Interp interp, const char *src, STRING *type, int argc, +compile_run(PARROT_INTERP, const char *src, STRING *type, int argc, char *argv[]) { STRING *smain; @@ -150,7 +146,7 @@ } static opcode_t * -run(Parrot_Interp interp, int argc, char *argv[]) +run(PARROT_INTERP, int argc, char *argv[]) { const char *c_src = ".sub main :main\n" " print \"ok\\n\"\n" ".end\n"; @@ -210,7 +206,7 @@ #include "parrot/extend.h" static void -compile_run(Parrot_Interp interp, const char *src, STRING *type, int argc, +compile_run(PARROT_INTERP, const char *src, STRING *type, int argc, char *argv[]) { STRING *smain; @@ -243,7 +239,7 @@ } static opcode_t * -run(Parrot_Interp interp, int argc, char *argv[]) +run(PARROT_INTERP, int argc, char *argv[]) { const char *c_src = ".sub main :main\n" " print ok\\n\"\n" ".end\n"; @@ -303,7 +299,7 @@ #include "parrot/extend.h" static void -compile_run(Parrot_Interp interp, const char *src, STRING *type, int argc, +compile_run(PARROT_INTERP, const char *src, STRING *type, int argc, char *argv[]) { STRING *smain; @@ -336,7 +332,7 @@ } static opcode_t * -run(Parrot_Interp interp, int argc, char *argv[]) +run(PARROT_INTERP, int argc, char *argv[]) { const char *c_src = ".sub main :main\n" " print ok\\n\"\n" ".end\n"; @@ -395,7 +391,7 @@ #include "parrot/extend.h" static void -compile_run(Parrot_Interp interp, const char *src, STRING *type, int argc, +compile_run(PARROT_INTERP, const char *src, STRING *type, int argc, char *argv[]) { STRING *smain; @@ -428,7 +424,7 @@ } static opcode_t * -run(Parrot_Interp interp, int argc, char *argv[]) +run(PARROT_INTERP, int argc, char *argv[]) { const char *c_src = ".sub main :main\n" " print ok\\n\"\n" ".end\n"; Index: t/src/exit.t =================================================================== --- t/src/exit.t (revision 34727) +++ t/src/exit.t (working copy) @@ -6,10 +6,8 @@ use warnings; use lib qw( . lib ../lib ../../lib ); use Test::More; -use Parrot::Test; +use Parrot::Test tests => 1; -plan tests => 1; - =head1 NAME t/src/exit.t - Exiting @@ -30,19 +28,19 @@ #include void -ex1(Parrot_Interp interp, int x, void*p) +ex1(PARROT_INTERP, int x, void*p) { printf("ex1\n"); } void -ex2(Parrot_Interp interp, int x, void*p) +ex2(PARROT_INTERP, int x, void*p) { printf("ex2\n"); } void -ex3(Parrot_Interp interp, int x, void*p) +ex3(PARROT_INTERP, int x, void*p) { Parrot_io_printf(interp, "ex3\n"); } Index: t/src/extend.t =================================================================== --- t/src/extend.t (revision 34727) +++ t/src/extend.t (working copy) @@ -184,7 +184,7 @@ #include "parrot/extend.h" static opcode_t* -the_test(Parrot_Interp interp, opcode_t *cur_op, opcode_t *start) +the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start) { Parrot_Int type = Parrot_PMC_typenum(interp, "ResizablePMCArray"); Parrot_PMC array = Parrot_PMC_new(interp, type); @@ -438,7 +438,7 @@ * so that buffering in PIO is not an issue */ static opcode_t* -the_test(Parrot_Interp interp, opcode_t *cur_op, opcode_t *start) +the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start) { PackFile *pf = Parrot_readbc(interp, "$temp_pbc"); STRING *name = const_string(interp, "_sub1"); @@ -512,7 +512,7 @@ * so that buffering in PIO is not an issue */ static opcode_t* -the_test(Parrot_Interp interp, opcode_t *cur_op, opcode_t *start) +the_test(PARROT_INTERP, opcode_t *cur_op, opcode_t *start) { PackFile *pf = Parrot_readbc(interp, "$temp_pbc"); STRING *name = const_string(interp, "_sub1"); @@ -709,7 +709,7 @@ */ void interp_cleanup(Parrot_Interp, int); -void interp_cleanup(Parrot_Interp interp, int status) +void interp_cleanup(PARROT_INTERP, int status) { handler_node_t *node = interp->exit_handler_list;