Index: include/parrot/extend.h
===================================================================
RCS file: /cvs/public/parrot/include/parrot/extend.h,v
retrieving revision 1.13
diff -u -r1.13 extend.h
--- include/parrot/extend.h	16 Jan 2004 13:29:58 -0000	1.13
+++ include/parrot/extend.h	25 Jan 2004 00:56:34 -0000
@@ -25,14 +25,12 @@
    but that would be really annoying */
 #if defined(PARROT_IN_CORE)
 
-#define Parrot_INTERP struct Parrot_Interp *
 #define Parrot_STRING STRING *
 #define Parrot_PMC PMC *
 #define Parrot_Language Parrot_Int
 
 #else
 
-typedef void * Parrot_INTERP;
 typedef void * Parrot_STRING;
 typedef void * Parrot_PMC;
 typedef Parrot_Int Parrot_Language;
@@ -43,61 +41,61 @@
 
 #endif
 
-Parrot_PMC Parrot_PMC_get_pmc_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-Parrot_STRING Parrot_PMC_get_string(Parrot_INTERP, Parrot_PMC);
-Parrot_STRING Parrot_PMC_get_string_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-void *Parrot_PMC_get_pointer(Parrot_INTERP, Parrot_PMC);
-void *Parrot_PMC_get_pointer_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-Parrot_Int Parrot_PMC_get_intval(Parrot_INTERP, Parrot_PMC);
-Parrot_Int Parrot_PMC_get_intval_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-Parrot_Float Parrot_PMC_get_numval(Parrot_INTERP, Parrot_PMC);
-Parrot_Float Parrot_PMC_get_numval_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-char *Parrot_PMC_get_cstring(Parrot_INTERP, Parrot_PMC);
-char *Parrot_PMC_get_cstring_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-char *Parrot_PMC_get_cstringn(Parrot_INTERP, Parrot_PMC, Parrot_Int *);
-char *Parrot_PMC_get_cstringn_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int *, Parrot_Int);
-
-void Parrot_PMC_set_pmc_intkey(Parrot_INTERP, Parrot_PMC, Parrot_PMC, Parrot_Int);
-void Parrot_PMC_set_string(Parrot_INTERP, Parrot_PMC, Parrot_STRING);
-void Parrot_PMC_set_string_intkey(Parrot_INTERP, Parrot_PMC, Parrot_STRING, Parrot_Int);
-void Parrot_PMC_set_pointer(Parrot_INTERP, Parrot_PMC, void *);
-void Parrot_PMC_set_pointer_intkey(Parrot_INTERP, Parrot_PMC, void *, Parrot_Int);
-void Parrot_PMC_set_cstring(Parrot_INTERP, Parrot_PMC, const char *);
-void Parrot_PMC_set_cstring_intkey(Parrot_INTERP, Parrot_PMC, const char *, Parrot_Int);
-void Parrot_PMC_set_cstringn(Parrot_INTERP, Parrot_PMC, const char *, Parrot_Int);
-void Parrot_PMC_set_cstringn_intkey(Parrot_INTERP, Parrot_PMC, const char *, Parrot_Int, Parrot_Int);
-void Parrot_PMC_set_intval(Parrot_INTERP, Parrot_PMC, Parrot_Int);
-void Parrot_PMC_set_intval_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Int, Parrot_Int);
-void Parrot_PMC_set_numval(Parrot_INTERP, Parrot_PMC, Parrot_Float);
-void Parrot_PMC_set_numval_intkey(Parrot_INTERP, Parrot_PMC, Parrot_Float, Parrot_Int);
+Parrot_PMC Parrot_PMC_get_pmc_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+Parrot_STRING Parrot_PMC_get_string(Parrot_Interp, Parrot_PMC);
+Parrot_STRING Parrot_PMC_get_string_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+void *Parrot_PMC_get_pointer(Parrot_Interp, Parrot_PMC);
+void *Parrot_PMC_get_pointer_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+Parrot_Int Parrot_PMC_get_intval(Parrot_Interp, Parrot_PMC);
+Parrot_Int Parrot_PMC_get_intval_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+Parrot_Float Parrot_PMC_get_numval(Parrot_Interp, Parrot_PMC);
+Parrot_Float Parrot_PMC_get_numval_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+char *Parrot_PMC_get_cstring(Parrot_Interp, Parrot_PMC);
+char *Parrot_PMC_get_cstring_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int);
+char *Parrot_PMC_get_cstringn(Parrot_Interp, Parrot_PMC, Parrot_Int *);
+char *Parrot_PMC_get_cstringn_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int *, Parrot_Int);
+
+void Parrot_PMC_set_pmc_intkey(Parrot_Interp, Parrot_PMC, Parrot_PMC, Parrot_Int);
+void Parrot_PMC_set_string(Parrot_Interp, Parrot_PMC, Parrot_STRING);
+void Parrot_PMC_set_string_intkey(Parrot_Interp, Parrot_PMC, Parrot_STRING, Parrot_Int);
+void Parrot_PMC_set_pointer(Parrot_Interp, Parrot_PMC, void *);
+void Parrot_PMC_set_pointer_intkey(Parrot_Interp, Parrot_PMC, void *, Parrot_Int);
+void Parrot_PMC_set_cstring(Parrot_Interp, Parrot_PMC, const char *);
+void Parrot_PMC_set_cstring_intkey(Parrot_Interp, Parrot_PMC, const char *, Parrot_Int);
+void Parrot_PMC_set_cstringn(Parrot_Interp, Parrot_PMC, const char *, Parrot_Int);
+void Parrot_PMC_set_cstringn_intkey(Parrot_Interp, Parrot_PMC, const char *, Parrot_Int, Parrot_Int);
+void Parrot_PMC_set_intval(Parrot_Interp, Parrot_PMC, Parrot_Int);
+void Parrot_PMC_set_intval_intkey(Parrot_Interp, Parrot_PMC, Parrot_Int, Parrot_Int);
+void Parrot_PMC_set_numval(Parrot_Interp, Parrot_PMC, Parrot_Float);
+void Parrot_PMC_set_numval_intkey(Parrot_Interp, Parrot_PMC, Parrot_Float, Parrot_Int);
 
-Parrot_PMC Parrot_PMC_new(Parrot_INTERP, Parrot_Int);
+Parrot_PMC Parrot_PMC_new(Parrot_Interp, Parrot_Int);
 Parrot_PMC Parrot_PMC_null(void);
-Parrot_Int Parrot_PMC_typenum(Parrot_INTERP, const char *);
+Parrot_Int Parrot_PMC_typenum(Parrot_Interp, const char *);
 
 void Parrot_free_cstring(char *);
 
-void Parrot_call(Parrot_INTERP, Parrot_PMC, Parrot_Int, ...);
-void Parrot_call_method(Parrot_INTERP, Parrot_PMC, Parrot_STRING, Parrot_Int, ...);
+void Parrot_call(Parrot_Interp, Parrot_PMC, Parrot_Int, ...);
+void Parrot_call_method(Parrot_Interp, Parrot_PMC, Parrot_STRING, Parrot_Int, ...);
 
-Parrot_Int    Parrot_get_intreg(Parrot_INTERP, Parrot_Int);
-Parrot_Float  Parrot_get_numreg(Parrot_INTERP, Parrot_Int);
-Parrot_STRING Parrot_get_strreg(Parrot_INTERP, Parrot_Int);
-Parrot_PMC    Parrot_get_pmcreg(Parrot_INTERP, Parrot_Int);
-
-void Parrot_set_intreg(Parrot_INTERP, Parrot_Int, Parrot_Int);
-void Parrot_set_numreg(Parrot_INTERP, Parrot_Int, Parrot_Float);
-void Parrot_set_strreg(Parrot_INTERP, Parrot_Int, Parrot_STRING);
-void Parrot_set_pmcreg(Parrot_INTERP, Parrot_Int, Parrot_PMC);
-
-Parrot_STRING Parrot_new_string(Parrot_INTERP, char *, int, Parrot_Encoding, Parrot_CharType, Parrot_Language, Parrot_Int);
-
-Parrot_Const_CharType Parrot_find_chartype(Parrot_INTERP, char*);
-Parrot_Language Parrot_find_language(Parrot_INTERP, char*);
-Parrot_Const_Encoding Parrot_find_encoding(Parrot_INTERP, char*);
+Parrot_Int    Parrot_get_intreg(Parrot_Interp, Parrot_Int);
+Parrot_Float  Parrot_get_numreg(Parrot_Interp, Parrot_Int);
+Parrot_STRING Parrot_get_strreg(Parrot_Interp, Parrot_Int);
+Parrot_PMC    Parrot_get_pmcreg(Parrot_Interp, Parrot_Int);
+
+void Parrot_set_intreg(Parrot_Interp, Parrot_Int, Parrot_Int);
+void Parrot_set_numreg(Parrot_Interp, Parrot_Int, Parrot_Float);
+void Parrot_set_strreg(Parrot_Interp, Parrot_Int, Parrot_STRING);
+void Parrot_set_pmcreg(Parrot_Interp, Parrot_Int, Parrot_PMC);
+
+Parrot_STRING Parrot_new_string(Parrot_Interp, char *, int, Parrot_Encoding, Parrot_CharType, Parrot_Language, Parrot_Int);
+
+Parrot_Const_CharType Parrot_find_chartype(Parrot_Interp, char*);
+Parrot_Language Parrot_find_language(Parrot_Interp, char*);
+Parrot_Const_Encoding Parrot_find_encoding(Parrot_Interp, char*);
 
-void Parrot_register_pmc(Parrot_INTERP, Parrot_PMC);
-void Parrot_unregister_pmc(Parrot_INTERP, Parrot_PMC);
+void Parrot_register_pmc(Parrot_Interp, Parrot_PMC);
+void Parrot_unregister_pmc(Parrot_Interp, Parrot_PMC);
 
 #endif
 
Index: src/extend.c
===================================================================
RCS file: /cvs/public/parrot/src/extend.c,v
retrieving revision 1.17
diff -u -r1.17 extend.c
--- src/extend.c	16 Jan 2004 13:30:07 -0000	1.17
+++ src/extend.c	25 Jan 2004 00:56:34 -0000
@@ -30,7 +30,7 @@
  * PMC.
  */
 
-Parrot_STRING Parrot_PMC_get_string(Parrot_INTERP interp, Parrot_PMC pmc) {
+Parrot_STRING Parrot_PMC_get_string(Parrot_Interp interp, Parrot_PMC pmc) {
   return VTABLE_get_string(interp, pmc);
 }
 
@@ -40,7 +40,7 @@
  * PMC.
  */
 
-void *Parrot_PMC_get_pointer(Parrot_INTERP interp, Parrot_PMC pmc) {
+void *Parrot_PMC_get_pointer(Parrot_Interp interp, Parrot_PMC pmc) {
     return VTABLE_get_pointer(interp, pmc);
 }
 
@@ -49,7 +49,7 @@
  * Return the keyed, signed integer value of the value in the PMC
  */
 
-void *Parrot_PMC_get_pointer_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int key) {
+void *Parrot_PMC_get_pointer_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int key) {
     return VTABLE_get_pointer_keyed_int(interp, pmc, key);
 }
 
@@ -58,7 +58,7 @@
  * Return the integer keyed PMC value of the passed-in PMC
  */
 
-Parrot_PMC Parrot_PMC_get_pmc_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int key) {
+Parrot_PMC Parrot_PMC_get_pmc_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int key) {
     return VTABLE_get_pmc_keyed_int(interp, pmc, key);
 }
 
@@ -67,7 +67,7 @@
  * Return the signed integer value of the value in the PMC
  */
 
-Parrot_Int Parrot_PMC_get_intval(Parrot_INTERP interp, Parrot_PMC pmc) {
+Parrot_Int Parrot_PMC_get_intval(Parrot_Interp interp, Parrot_PMC pmc) {
     return VTABLE_get_integer(interp, pmc);
 }
 
@@ -76,7 +76,7 @@
  * Return the keyed, signed integer value of the value in the PMC
  */
 
-Parrot_Int Parrot_PMC_get_intval_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int key) {
+Parrot_Int Parrot_PMC_get_intval_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int key) {
     return VTABLE_get_integer_keyed_int(interp, pmc, key);
 }
 
@@ -85,7 +85,7 @@
  * Return the floating-point value of the PMC
  */
 
-Parrot_Float Parrot_PMC_get_numval(Parrot_INTERP interp, Parrot_PMC pmc) {
+Parrot_Float Parrot_PMC_get_numval(Parrot_Interp interp, Parrot_PMC pmc) {
     return VTABLE_get_number(interp, pmc);
 }
 
@@ -94,7 +94,7 @@
  * Return the keyed, signed integer value of the value in the PMC
  */
 
-Parrot_Float Parrot_PMC_get_numval_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int key) {
+Parrot_Float Parrot_PMC_get_numval_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int key) {
     return VTABLE_get_number_keyed_int(interp, pmc, key);
 }
 
@@ -103,7 +103,7 @@
  * Return a null-terminated string that represents the string value of
  * the PMC.
  */
-char *Parrot_PMC_get_cstring_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int key) {
+char *Parrot_PMC_get_cstring_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int key) {
     STRING *retval;
     retval = VTABLE_get_string_keyed_int(interp, pmc, key);
     return string_to_cstring(interp, retval);
@@ -114,7 +114,7 @@
  * Return a null-terminated string that represents the string value of
  * the PMC.
  */
-char *Parrot_PMC_get_cstring(Parrot_INTERP interp, Parrot_PMC pmc) {
+char *Parrot_PMC_get_cstring(Parrot_Interp interp, Parrot_PMC pmc) {
     STRING *retval;
     retval = VTABLE_get_string(interp, pmc);
     return string_to_cstring(interp, retval);
@@ -128,7 +128,7 @@
  * Yes, right now this is a bit of a cheat. It needs fixing, but
  * without disturbing the interface.
  */
-char *Parrot_PMC_get_cstringn(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int *length) {
+char *Parrot_PMC_get_cstringn(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int *length) {
     char *retval;
     retval = string_to_cstring(interp, VTABLE_get_string(interp, pmc));
     *length = strlen(retval);
@@ -143,7 +143,7 @@
  * Yes, right now this is a bit of a cheat. It needs fixing, but
  * without disturbing the interface.
  */
-char *Parrot_PMC_get_cstringn_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int *length, Parrot_Int key) {
+char *Parrot_PMC_get_cstringn_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int *length, Parrot_Int key) {
     char *retval;
     retval = string_to_cstring(interp, VTABLE_get_string_keyed_int(interp, pmc, key));
     *length = strlen(retval);
@@ -154,7 +154,7 @@
  *
  * Assign the passed-in parrot string to the passed-in PMC
  */
-void Parrot_PMC_set_string(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_STRING value) {
+void Parrot_PMC_set_string(Parrot_Interp interp, Parrot_PMC pmc, Parrot_STRING value) {
     VTABLE_set_string_native(interp, pmc, value);
 }
 
@@ -162,7 +162,7 @@
  *
  * Assign the passed-in parrot string to the passed-in PMC
  */
-void Parrot_PMC_set_string_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_STRING value, Parrot_Int key) {
+void Parrot_PMC_set_string_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_STRING value, Parrot_Int key) {
     VTABLE_set_string_keyed_int(interp, pmc, key, value);
 }
 
@@ -170,7 +170,7 @@
  *
  * Assign the passed-in pointer to the passed-in PMC
  */
-void Parrot_PMC_set_pointer(Parrot_INTERP interp, Parrot_PMC pmc, void *value) {
+void Parrot_PMC_set_pointer(Parrot_Interp interp, Parrot_PMC pmc, void *value) {
     VTABLE_set_pointer(interp, pmc, value);
 }
 
@@ -178,7 +178,7 @@
  *
  * Assign the passed-in pmc to the passed-in slot of the passed-in PMC
  */
-void Parrot_PMC_set_pmc_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_PMC value, Parrot_Int key) {
+void Parrot_PMC_set_pmc_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_PMC value, Parrot_Int key) {
     VTABLE_set_pmc_keyed_int(interp, pmc, key, value);
 }
 
@@ -186,7 +186,7 @@
  *
  * Assign the passed-in pointer to the passed-in PMC
  */
-void Parrot_PMC_set_pointer_intkey(Parrot_INTERP interp, Parrot_PMC pmc, void *value, Parrot_Int key) {
+void Parrot_PMC_set_pointer_intkey(Parrot_Interp interp, Parrot_PMC pmc, void *value, Parrot_Int key) {
     VTABLE_set_pointer_keyed_int(interp, pmc, key, value);
 }
 
@@ -194,7 +194,7 @@
  *
  * Assign the passed-in parrot integer to the passed-in PMC
  */
-void Parrot_PMC_set_intval(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int value) {
+void Parrot_PMC_set_intval(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int value) {
     VTABLE_set_integer_native(interp, pmc, value);
 }
 
@@ -202,7 +202,7 @@
  *
  * Assign the passed-in parrot integer to the passed-in PMC
  */
-void Parrot_PMC_set_intval_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Int value, Parrot_Int key) {
+void Parrot_PMC_set_intval_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Int value, Parrot_Int key) {
     VTABLE_set_integer_keyed_int(interp, pmc, key, value);
 }
 
@@ -210,7 +210,7 @@
  *
  * Assign the passed-in parrot number to the passed-in PMC
  */
-void Parrot_PMC_set_numval(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Float value) {
+void Parrot_PMC_set_numval(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Float value) {
     VTABLE_set_number_native(interp, pmc, value);
 }
 
@@ -218,7 +218,7 @@
  *
  * Assign the passed-in parrot number to the passed-in PMC
  */
-void Parrot_PMC_set_numval_intkey(Parrot_INTERP interp, Parrot_PMC pmc, Parrot_Float value, Parrot_Int key) {
+void Parrot_PMC_set_numval_intkey(Parrot_Interp interp, Parrot_PMC pmc, Parrot_Float value, Parrot_Int key) {
     VTABLE_set_number_keyed_int(interp, pmc, key, value);
 }
 
@@ -226,7 +226,7 @@
  *
  * Assign the passed-in null-terminated C string to the passed-in PMC
  */
-void Parrot_PMC_set_cstring(Parrot_INTERP interp, Parrot_PMC pmc, const char *value) {
+void Parrot_PMC_set_cstring(Parrot_Interp interp, Parrot_PMC pmc, const char *value) {
     VTABLE_set_string_native(interp, pmc, string_from_cstring(interp, value, 0));
 }
 
@@ -234,7 +234,7 @@
  *
  * Assign the passed-in null-terminated C string to the passed-in PMC
  */
-void Parrot_PMC_set_cstring_intkey(Parrot_INTERP interp, Parrot_PMC pmc, const char *value, Parrot_Int key) {
+void Parrot_PMC_set_cstring_intkey(Parrot_Interp interp, Parrot_PMC pmc, const char *value, Parrot_Int key) {
     VTABLE_set_string_keyed_int(interp, pmc, key, string_from_cstring(interp, value, 0));
 }
 
@@ -242,7 +242,7 @@
  *
  * Assign the passed-in length-noted string  to the passed-in PMC
  */
-void Parrot_PMC_set_cstringn(Parrot_INTERP interp, Parrot_PMC pmc, const char *value, Parrot_Int length) {
+void Parrot_PMC_set_cstringn(Parrot_Interp interp, Parrot_PMC pmc, const char *value, Parrot_Int length) {
     VTABLE_set_string_native(interp, pmc, string_from_cstring(interp, value, length));
 }
 
@@ -250,7 +250,7 @@
  *
  * Assign the passed-in length-noted string  to the passed-in PMC
  */
-void Parrot_PMC_set_cstringn_intkey(Parrot_INTERP interp, Parrot_PMC pmc, const char *value, Parrot_Int length, Parrot_Int key) {
+void Parrot_PMC_set_cstringn_intkey(Parrot_Interp interp, Parrot_PMC pmc, const char *value, Parrot_Int length, Parrot_Int key) {
     VTABLE_set_string_keyed_int(interp, pmc, key, string_from_cstring(interp, value, length));
 }
 
@@ -258,7 +258,7 @@
  *
  * Create and return a new PMC
  */
-Parrot_PMC Parrot_PMC_new(Parrot_INTERP interp, Parrot_Int type) {
+Parrot_PMC Parrot_PMC_new(Parrot_Interp interp, Parrot_Int type) {
     Parrot_PMC newpmc;
     newpmc = pmc_new_noinit(interp, type);
     VTABLE_init(interp, newpmc);
@@ -269,7 +269,7 @@
  *
  * Returns the internal identifier that represents the named class
  */
-Parrot_Int Parrot_PMC_typenum(Parrot_INTERP interp, const char *class) {
+Parrot_Int Parrot_PMC_typenum(Parrot_Interp interp, const char *class) {
     return pmc_type(interp, string_from_cstring(interp, class, 0));
 }
 
@@ -290,7 +290,7 @@
  *
  * Call a parrot subroutine, with PMC parameters
  */
-void Parrot_call(Parrot_INTERP interpreter, Parrot_PMC sub,
+void Parrot_call(Parrot_Interp interpreter, Parrot_PMC sub,
                  Parrot_Int argcount, ...) {
     Parrot_Int inreg = 0;
     va_list ap;
@@ -328,7 +328,7 @@
  *
  * Call a parrot method, with PMC parameters
  */
-void Parrot_call_method(Parrot_INTERP interp, Parrot_PMC sub,
+void Parrot_call_method(Parrot_Interp interp, Parrot_PMC sub,
                         Parrot_STRING method, Parrot_Int argcount, ...) {
 }
 
@@ -337,7 +337,7 @@
  *
  * Return the value of an integer register
  */
-Parrot_Int Parrot_get_intreg(Parrot_INTERP interpreter, Parrot_Int regnum) {
+Parrot_Int Parrot_get_intreg(Parrot_Interp interpreter, Parrot_Int regnum) {
     return REG_INT(regnum);
 }
 
@@ -345,7 +345,7 @@
  *
  * Return the value of a numeric register
  */
-Parrot_Float Parrot_get_numreg(Parrot_INTERP interpreter, Parrot_Int regnum) {
+Parrot_Float Parrot_get_numreg(Parrot_Interp interpreter, Parrot_Int regnum) {
     return REG_NUM(regnum);
 }
 
@@ -353,7 +353,7 @@
  *
  * Return the value of a string register
  */
-Parrot_STRING Parrot_get_strreg(Parrot_INTERP interpreter, Parrot_Int regnum) {
+Parrot_STRING Parrot_get_strreg(Parrot_Interp interpreter, Parrot_Int regnum) {
     return REG_STR(regnum);
 }
 
@@ -361,7 +361,7 @@
  *
  * Return the value of a PMC register
  */
-Parrot_PMC Parrot_get_pmcreg(Parrot_INTERP interpreter, Parrot_Int regnum) {
+Parrot_PMC Parrot_get_pmcreg(Parrot_Interp interpreter, Parrot_Int regnum) {
     return REG_PMC(regnum);
 }
 
@@ -369,7 +369,7 @@
  *
  * Set the value of an I register
  */
-void Parrot_set_intreg(Parrot_INTERP interpreter, Parrot_Int regnum, Parrot_Int value) {
+void Parrot_set_intreg(Parrot_Interp interpreter, Parrot_Int regnum, Parrot_Int value) {
     REG_INT(regnum) = value;
 }
 
@@ -377,7 +377,7 @@
  *
  * Set the value of an N register
  */
-void Parrot_set_numreg(Parrot_INTERP interpreter, Parrot_Int regnum, Parrot_Float value) {
+void Parrot_set_numreg(Parrot_Interp interpreter, Parrot_Int regnum, Parrot_Float value) {
     REG_NUM(regnum) = value;
 }
 
@@ -385,7 +385,7 @@
  *
  * Set the value of an S register
  */
-void Parrot_set_strreg(Parrot_INTERP interpreter, Parrot_Int regnum, Parrot_STRING value) {
+void Parrot_set_strreg(Parrot_Interp interpreter, Parrot_Int regnum, Parrot_STRING value) {
     REG_STR(regnum) = value;
 }
 
@@ -393,7 +393,7 @@
  *
  * Set the value of a P  register
  */
-void Parrot_set_pmcreg(Parrot_INTERP interpreter, Parrot_Int regnum, Parrot_PMC value) {
+void Parrot_set_pmcreg(Parrot_Interp interpreter, Parrot_Int regnum, Parrot_PMC value) {
     REG_PMC(regnum) = value;
 }
 
@@ -406,7 +406,7 @@
  * A copy of the buffer is made.
  *
  */
-Parrot_STRING Parrot_new_string(Parrot_INTERP interpreter,
+Parrot_STRING Parrot_new_string(Parrot_Interp interpreter,
                                 char *buffer, int length,
                                 Parrot_Encoding encoding,
                                 Parrot_CharType charset,
@@ -419,7 +419,7 @@
  *
  * Find the magic token for an encoding, by name
  */
-Parrot_Const_Encoding Parrot_find_encoding(Parrot_INTERP interpreter, char *encoding_name) {
+Parrot_Const_Encoding Parrot_find_encoding(Parrot_Interp interpreter, char *encoding_name) {
     return Parrot_encoding_lookup(encoding_name);
 }
 
@@ -428,7 +428,7 @@
  * Find the magic language token for a language, by language name
  *
  */
-Parrot_Language Parrot_find_language(Parrot_INTERP interpreter, char *langauge) {
+Parrot_Language Parrot_find_language(Parrot_Interp interpreter, char *langauge) {
     return 0;
 }
 
@@ -437,7 +437,7 @@
  * Find the magic token for a chartype, by name
  *
  */
-Parrot_Const_CharType Parrot_find_chartype(Parrot_INTERP interpreter, char *chartype) {
+Parrot_Const_CharType Parrot_find_chartype(Parrot_Interp interpreter, char *chartype) {
     return Parrot_chartype_lookup(chartype);
 }
 
@@ -450,7 +450,7 @@
  */
 
 void
-Parrot_register_pmc(Parrot_INTERP interpreter, Parrot_PMC pmc)
+Parrot_register_pmc(Parrot_Interp interpreter, Parrot_PMC pmc)
 {
     dod_register_pmc(interpreter, pmc);
 }
@@ -464,7 +464,7 @@
  */
 
 void
-Parrot_unregister_pmc(Parrot_INTERP interpreter, Parrot_PMC pmc)
+Parrot_unregister_pmc(Parrot_Interp interpreter, Parrot_PMC pmc)
 {
     dod_unregister_pmc(interpreter, pmc);
 }