Skip to content
This repository
Browse code

changed interp in pmc class to INTERP for unification

git-svn-id: https://svn.parrot.org/parrot/trunk@46300 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
commit 26914e12adecfae2948f49b7fd5e0e54aa0178e7 1 parent 4d3324b
authored May 05, 2010

Showing 68 changed files with 1,286 additions and 1,287 deletions. Show diff stats Hide diff stats

  1. 34  src/dynpmc/dynlexpad.pmc
  2. 30  src/dynpmc/file.pmc
  3. 8  src/dynpmc/foo.pmc
  4. 12  src/dynpmc/os.pmc
  5. 26  src/dynpmc/pccmethod_test.pmc
  6. 20  src/dynpmc/subproxy.pmc
  7. 7  src/oo.c
  8. 12  src/pmc/addrregistry.pmc
  9. 36  src/pmc/arrayiterator.pmc
  10. 56  src/pmc/bigint.pmc
  11. 56  src/pmc/bignum.pmc
  12. 46  src/pmc/callcontext.pmc
  13. 36  src/pmc/complex.pmc
  14. 10  src/pmc/coroutine.pmc
  15. 154  src/pmc/default.pmc
  16. 12  src/pmc/env.pmc
  17. 8  src/pmc/eval.pmc
  18. 14  src/pmc/eventhandler.pmc
  19. 168  src/pmc/exception.pmc
  20. 30  src/pmc/exceptionhandler.pmc
  21. 72  src/pmc/exporter.pmc
  22. 20  src/pmc/filehandle.pmc
  23. 4  src/pmc/fixedbooleanarray.pmc
  24. 2  src/pmc/fixedfloatarray.pmc
  25. 8  src/pmc/fixedintegerarray.pmc
  26. 14  src/pmc/fixedpmcarray.pmc
  27. 12  src/pmc/fixedstringarray.pmc
  28. 4  src/pmc/handle.pmc
  29. 16  src/pmc/hash.pmc
  30. 22  src/pmc/imageio.pmc
  31. 12  src/pmc/imageiosize.pmc
  32. 114  src/pmc/integer.pmc
  33. 2  src/pmc/key.pmc
  34. 12  src/pmc/lexinfo.pmc
  35. 4  src/pmc/managedstruct.pmc
  36. 46  src/pmc/multisub.pmc
  37. 78  src/pmc/namespace.pmc
  38. 10  src/pmc/null.pmc
  39. 184  src/pmc/object.pmc
  40. 6  src/pmc/opcode.pmc
  41. 4  src/pmc/oplib.pmc
  42. 84  src/pmc/packfile.pmc
  43. 10  src/pmc/packfileannotation.pmc
  44. 96  src/pmc/packfileannotations.pmc
  45. 80  src/pmc/packfileconstanttable.pmc
  46. 46  src/pmc/packfiledirectory.pmc
  47. 8  src/pmc/packfilefixupentry.pmc
  48. 24  src/pmc/packfilefixuptable.pmc
  49. 20  src/pmc/packfilerawsegment.pmc
  50. 6  src/pmc/packfilesegment.pmc
  51. 98  src/pmc/parrotinterpreter.pmc
  52. 22  src/pmc/parrotthread.pmc
  53. 146  src/pmc/pmcproxy.pmc
  54. 10  src/pmc/resizablebooleanarray.pmc
  55. 8  src/pmc/resizablefloatarray.pmc
  56. 10  src/pmc/resizableintegerarray.pmc
  57. 16  src/pmc/resizablestringarray.pmc
  58. 152  src/pmc/role.pmc
  59. 40  src/pmc/scheduler.pmc
  60. 12  src/pmc/schedulermessage.pmc
  61. 16  src/pmc/socket.pmc
  62. 16  src/pmc/string.pmc
  63. 22  src/pmc/stringhandle.pmc
  64. 106  src/pmc/sub.pmc
  65. 80  src/pmc/task.pmc
  66. 6  src/pmc/timer.pmc
  67. 16  src/pmc/undef.pmc
  68. 2  src/pmc/unmanagedstruct.pmc
34  src/dynpmc/dynlexpad.pmc
@@ -24,7 +24,7 @@ pmclass DynLexPad dynpmc provides lexpad auto_attrs {
24 24
     ATTR PMC  *init; /* the PMC used to initialize this DynLexPad */
25 25
 
26 26
     VTABLE void init() {
27  
-        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_INVALID_OPERATION,
  27
+        Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
28 28
             "don't create me like this");
29 29
     }
30 30
 
@@ -44,8 +44,8 @@ lexinfo.
44 44
         Parrot_DynLexPad_attributes *attrs =
45 45
             (Parrot_DynLexPad_attributes *) PMC_data(SELF);
46 46
 
47  
-        if (VTABLE_elements(interp, lexinfo)) {
48  
-            attrs->init = Parrot_pmc_new_init(interp, enum_class_LexPad, lexinfo);
  47
+        if (VTABLE_elements(INTERP, lexinfo)) {
  48
+            attrs->init = Parrot_pmc_new_init(INTERP, enum_class_LexPad, lexinfo);
49 49
         }
50 50
         else
51 51
             attrs->init = NULL;
@@ -68,7 +68,7 @@ Initialize the LexPad PMC and remember the associate context.
68 68
     VTABLE void set_pointer(void* ctx) {
69 69
         PMC *std_pad = PARROT_DYNLEXPAD(SELF)->init;
70 70
         if (std_pad)
71  
-            VTABLE_set_pointer(interp, std_pad, ctx);
  71
+            VTABLE_set_pointer(INTERP, std_pad, ctx);
72 72
     }
73 73
 
74 74
 /*
@@ -81,7 +81,7 @@ Returns the number of elements in the hash.
81 81
 
82 82
 */
83 83
     VTABLE INTVAL elements() {
84  
-        return parrot_hash_size(interp, PARROT_DYNLEXPAD(SELF)->hash);
  84
+        return parrot_hash_size(INTERP, PARROT_DYNLEXPAD(SELF)->hash);
85 85
     }
86 86
 
87 87
 /*
@@ -97,17 +97,17 @@ Returns whether a lexical C<name> exists in the hash.
97 97
 */
98 98
 
99 99
     VTABLE INTVAL exists_keyed(PMC* name) {
100  
-        STRING *s = VTABLE_get_string(interp, name);
  100
+        STRING *s = VTABLE_get_string(INTERP, name);
101 101
         return SELF.exists_keyed_str(s);
102 102
     }
103 103
 
104 104
     VTABLE INTVAL exists_keyed_str(STRING* name) {
105 105
         PMC *std_pad;
106  
-        if (parrot_hash_exists(interp, PARROT_DYNLEXPAD(SELF)->hash, name))
  106
+        if (parrot_hash_exists(INTERP, PARROT_DYNLEXPAD(SELF)->hash, name))
107 107
             return 1;
108 108
         std_pad = PARROT_DYNLEXPAD(SELF)->init;
109 109
         if (std_pad)
110  
-            return VTABLE_exists_keyed_str(interp, std_pad, name);
  110
+            return VTABLE_exists_keyed_str(INTERP, std_pad, name);
111 111
         return 0;
112 112
     }
113 113
 
@@ -124,14 +124,14 @@ lexical doesn't exist.
124 124
 
125 125
 */
126 126
     VTABLE PMC* get_pmc_keyed_str(STRING* name) {
127  
-        HashBucket *b = parrot_hash_get_bucket(interp,
  127
+        HashBucket *b = parrot_hash_get_bucket(INTERP,
128 128
             PARROT_DYNLEXPAD(SELF)->hash, name);
129 129
 
130 130
         if (!b) {
131 131
             PMC *std_pad = PARROT_DYNLEXPAD(SELF)->init;
132 132
 
133 133
             if (std_pad)
134  
-                return VTABLE_get_pmc_keyed_str(interp, std_pad, name);
  134
+                return VTABLE_get_pmc_keyed_str(INTERP, std_pad, name);
135 135
 
136 136
             return PMCNULL;
137 137
         }
@@ -140,7 +140,7 @@ lexical doesn't exist.
140 140
     }
141 141
 
142 142
     VTABLE PMC* get_pmc_keyed(PMC* name) {
143  
-        STRING *s = VTABLE_get_string(interp, name);
  143
+        STRING *s = VTABLE_get_string(INTERP, name);
144 144
         return SELF.get_pmc_keyed_str(s);
145 145
     }
146 146
 
@@ -159,17 +159,17 @@ doesn't exist, it is created.
159 159
 */
160 160
 
161 161
     VTABLE void set_pmc_keyed(PMC* name, PMC* value) {
162  
-        STRING *s = VTABLE_get_string(interp, name);
  162
+        STRING *s = VTABLE_get_string(INTERP, name);
163 163
         SELF.set_pmc_keyed_str(s, value);
164 164
     }
165 165
 
166 166
     VTABLE void set_pmc_keyed_str(STRING* name, PMC* value) {
167 167
         PMC *std_pad = PARROT_DYNLEXPAD(SELF)->init;
168 168
 
169  
-        if (std_pad && VTABLE_exists_keyed_str(interp, std_pad, name))
170  
-            VTABLE_set_pmc_keyed_str(interp, std_pad, name, value);
  169
+        if (std_pad && VTABLE_exists_keyed_str(INTERP, std_pad, name))
  170
+            VTABLE_set_pmc_keyed_str(INTERP, std_pad, name, value);
171 171
 
172  
-        parrot_hash_put(interp, PARROT_DYNLEXPAD(SELF)->hash, name, value);
  172
+        parrot_hash_put(INTERP, PARROT_DYNLEXPAD(SELF)->hash, name, value);
173 173
     }
174 174
 
175 175
 /*
@@ -184,7 +184,7 @@ Destroy DynLexPad.
184 184
 
185 185
     VTABLE void destroy() {
186 186
         if (PARROT_DYNLEXPAD(SELF)->hash) {
187  
-            parrot_hash_destroy(interp, PARROT_DYNLEXPAD(SELF)->hash);
  187
+            parrot_hash_destroy(INTERP, PARROT_DYNLEXPAD(SELF)->hash);
188 188
             PARROT_DYNLEXPAD(SELF)->hash = NULL;
189 189
         }
190 190
     }
@@ -202,7 +202,7 @@ Marks the lexpad hash as live.
202 202
         PMC *std_pad = PARROT_DYNLEXPAD(SELF)->init;
203 203
         Parrot_gc_mark_PMC_alive(INTERP, std_pad);
204 204
         if (PARROT_DYNLEXPAD(SELF)->hash)
205  
-            parrot_mark_hash(interp, PARROT_DYNLEXPAD(SELF)->hash);
  205
+            parrot_mark_hash(INTERP, PARROT_DYNLEXPAD(SELF)->hash);
206 206
     }
207 207
 
208 208
 
30  src/dynpmc/file.pmc
@@ -67,7 +67,7 @@ Returns a true value (1) if the supplied file or directory exists.
67 67
 
68 68
     METHOD exists(STRING *path) {
69 69
         struct stat info;
70  
-        char * const cpath = Parrot_str_to_cstring(interp, path);
  70
+        char * const cpath = Parrot_str_to_cstring(INTERP, path);
71 71
 #ifdef WIN32
72 72
         const int error = stat(cpath, &info);
73 73
 #else
@@ -93,7 +93,7 @@ Returns a true value (1) if the supplied path is a directory.
93 93
 
94 94
     METHOD is_dir(STRING *path) {
95 95
         struct stat info;
96  
-        char * const cpath = Parrot_str_to_cstring(interp, path);
  96
+        char * const cpath = Parrot_str_to_cstring(INTERP, path);
97 97
 #ifdef WIN32
98 98
         const int error = stat(cpath, &info);
99 99
 #else
@@ -103,7 +103,7 @@ Returns a true value (1) if the supplied path is a directory.
103 103
 
104 104
         if (error) {
105 105
             const char * const errmsg = strerror(errno);
106  
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  106
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
107 107
                 errmsg);
108 108
         }
109 109
 
@@ -125,7 +125,7 @@ Returns a true value (1) if the supplied path is a plain file.
125 125
 
126 126
     METHOD is_file(STRING *path) {
127 127
         struct stat info;
128  
-        char * const cpath = Parrot_str_to_cstring(interp, path);
  128
+        char * const cpath = Parrot_str_to_cstring(INTERP, path);
129 129
 #ifdef WIN32
130 130
         int error   = stat(cpath, &info);
131 131
 #else
@@ -135,7 +135,7 @@ Returns a true value (1) if the supplied path is a plain file.
135 135
 
136 136
         if (error) {
137 137
             const char * const errmsg = strerror(errno);
138  
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  138
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
139 139
                 errmsg);
140 140
         }
141 141
 
@@ -162,14 +162,14 @@ Returns a true value (1) if the supplied path is a link.
162 162
 #else
163 163
         struct stat info;
164 164
 
165  
-        char * const cpath = Parrot_str_to_cstring(interp, path);
  165
+        char * const cpath = Parrot_str_to_cstring(INTERP, path);
166 166
         const int    error = lstat(cpath, &info);
167 167
 
168 168
         Parrot_str_free_cstring(cpath);
169 169
 
170 170
         if (error) {
171 171
             const char * const errmsg = strerror(errno);
172  
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  172
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
173 173
                 errmsg);
174 174
         }
175 175
 
@@ -199,13 +199,13 @@ free to change or give me hints on how to change it. -- ambs
199 199
     METHOD copy(STRING *from, STRING *to) {
200 200
 #define CHUNK_SIZE 1024
201 201
 
202  
-        char * const cfrom  = Parrot_str_to_cstring(interp, from);
  202
+        char * const cfrom  = Parrot_str_to_cstring(INTERP, from);
203 203
         FILE * const source = fopen(cfrom, "rb");
204 204
 
205 205
         Parrot_str_free_cstring(cfrom);
206 206
 
207 207
         if (source) {
208  
-            char * const cto    = Parrot_str_to_cstring(interp, to);
  208
+            char * const cto    = Parrot_str_to_cstring(INTERP, to);
209 209
             FILE * const target = fopen(cto, "w+b");
210 210
 
211 211
             Parrot_str_free_cstring(cto);
@@ -218,7 +218,7 @@ free to change or give me hints on how to change it. -- ambs
218 218
                     if (bytes_read) {
219 219
                         const size_t bytes_written = fwrite(buf, 1, bytes_read, target);
220 220
                         if (bytes_read != bytes_written) {
221  
-                            Parrot_ex_throw_from_c_args(interp, NULL,
  221
+                            Parrot_ex_throw_from_c_args(INTERP, NULL,
222 222
                                 EXCEPTION_EXTERNAL_ERROR, "Error writing file");
223 223
                             break;
224 224
                         }
@@ -228,14 +228,14 @@ free to change or give me hints on how to change it. -- ambs
228 228
             }
229 229
             else {
230 230
                 const char * const errmsg = strerror(errno);
231  
-                Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  231
+                Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
232 232
                     errmsg);
233 233
             }
234 234
             fclose(source);
235 235
         }
236 236
         else {
237 237
             const char * const errmsg = strerror(errno);
238  
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  238
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
239 239
                 errmsg);
240 240
         }
241 241
 #undef CHUNK_SIZE
@@ -252,8 +252,8 @@ Rename a file C<from> to the path C<to>.
252 252
 */
253 253
 
254 254
     METHOD rename(STRING *from, STRING *to) {
255  
-        char * const cfrom = Parrot_str_to_cstring(interp, from);
256  
-        char * const   cto = Parrot_str_to_cstring(interp, to);
  255
+        char * const cfrom = Parrot_str_to_cstring(INTERP, from);
  256
+        char * const   cto = Parrot_str_to_cstring(INTERP, to);
257 257
         const int    error = rename(cfrom, cto);
258 258
 
259 259
         Parrot_str_free_cstring(cfrom);
@@ -261,7 +261,7 @@ Rename a file C<from> to the path C<to>.
261 261
 
262 262
         if (error) {
263 263
             const char * const errmsg = strerror(errno);
264  
-            Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_EXTERNAL_ERROR,
  264
+            Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_EXTERNAL_ERROR,
265 265
                 errmsg);
266 266
         }
267 267
     }
8  src/dynpmc/foo.pmc
@@ -16,15 +16,15 @@ pmclass Foo dynpmc group foo_group provides scalar extends Integer auto_attrs {
16 16
 
17 17
     MULTI PMC* subtract(Integer value, PMC *dest) {
18 18
         if (!dest)
19  
-            dest = Parrot_pmc_new(interp, SELF->vtable->base_type);
20  
-        VTABLE_set_integer_native(interp, dest, 144);
  19
+            dest = Parrot_pmc_new(INTERP, SELF->vtable->base_type);
  20
+        VTABLE_set_integer_native(INTERP, dest, 144);
21 21
         return dest;
22 22
     }
23 23
 
24 24
     MULTI PMC* subtract(DEFAULT value, PMC *dest) {
25 25
         if (!dest)
26  
-            dest = Parrot_pmc_new(interp, SELF->vtable->base_type);
27  
-        VTABLE_set_integer_native(interp, dest, 244);
  26
+            dest = Parrot_pmc_new(INTERP, SELF->vtable->base_type);
  27
+        VTABLE_set_integer_native(INTERP, dest, 244);
28 28
         return dest;
29 29
     }
30 30
 }
12  src/dynpmc/os.pmc
@@ -506,13 +506,13 @@ reads entries from a directory.
506 506
         HANDLE hFind = INVALID_HANDLE_VALUE;
507 507
 
508 508
         /* Add \* to the directory name and start search. */
509  
-        STRING *last_char = Parrot_str_substr(interp, path,
510  
-                                              Parrot_str_length(interp, path) - 1, 1, NULL, 0);
511  
-        int trailing_slash = Parrot_str_equal(interp, last_char, string_from_literal(interp, "\\"))
  509
+        STRING *last_char = Parrot_str_substr(INTERP, path,
  510
+                                              Parrot_str_length(INTERP, path) - 1, 1, NULL, 0);
  511
+        int trailing_slash = Parrot_str_equal(INTERP, last_char, string_from_literal(INTERP, "\\"))
512 512
                              ||
513  
-                             Parrot_str_equal(interp, last_char, string_from_literal(interp, "/"));
514  
-        cpath = Parrot_str_to_cstring(interp, Parrot_str_concat(interp,
515  
-                path, string_from_literal(interp, trailing_slash ? "*" : "\\*"), 0));
  513
+                             Parrot_str_equal(INTERP, last_char, string_from_literal(INTERP, "/"));
  514
+        cpath = Parrot_str_to_cstring(INTERP, Parrot_str_concat(INTERP,
  515
+                path, string_from_literal(INTERP, trailing_slash ? "*" : "\\*"), 0));
516 516
         hFind = FindFirstFile(cpath, &file_find_data);
517 517
         Parrot_str_free_cstring(cpath);
518 518
         if (hFind == INVALID_HANDLE_VALUE)
26  src/dynpmc/pccmethod_test.pmc
@@ -20,32 +20,32 @@ pmclass PCCMETHOD_Test dynpmc provides hash {
20 20
     METHOD test_method()
21 21
     {
22 22
         UNUSED(SELF);
23  
-        Parrot_io_printf(interp, "test_method\n");
  23
+        Parrot_io_printf(INTERP, "test_method\n");
24 24
     }
25 25
 
26 26
     METHOD test_method0(int a1)
27 27
     {
28 28
         UNUSED(SELF);
29  
-        Parrot_io_printf(interp, "test_method0\n");
30  
-        Parrot_io_printf(interp, "%d\n", a1);
  29
+        Parrot_io_printf(INTERP, "test_method0\n");
  30
+        Parrot_io_printf(INTERP, "%d\n", a1);
31 31
     }
32 32
 
33 33
     METHOD test_method1(int a1, int a2, int a3, int a4, int a5, int a6)
34 34
     {
35 35
         UNUSED(SELF);
36  
-        Parrot_io_printf(interp, "test_method1\n");
37  
-        Parrot_io_printf(interp, "%d,%d,%d,%d,%d,%d\n", a1, a2, a3, a4, a5, a6);
  36
+        Parrot_io_printf(INTERP, "test_method1\n");
  37
+        Parrot_io_printf(INTERP, "%d,%d,%d,%d,%d,%d\n", a1, a2, a3, a4, a5, a6);
38 38
     }
39 39
 
40 40
     METHOD test_method2(int a1 :optional, int a1o :opt_flag,
41 41
                            PMC *slurpy_pos :slurpy)
42 42
     {
43  
-        STRING *kevin = CONST_STRING(interp, "KEVIN");
  43
+        STRING *kevin = CONST_STRING(INTERP, "KEVIN");
44 44
         UNUSED(SELF);
45  
-        Parrot_io_printf(interp, "test_method2\n");
46  
-        Parrot_io_printf(interp, "%d, %d, %Ss %Ss\n", a1, a1o,
47  
-            VTABLE_name(interp, slurpy_pos),
48  
-            VTABLE_get_repr(interp, slurpy_pos));
  45
+        Parrot_io_printf(INTERP, "test_method2\n");
  46
+        Parrot_io_printf(INTERP, "%d, %d, %Ss %Ss\n", a1, a1o,
  47
+            VTABLE_name(INTERP, slurpy_pos),
  48
+            VTABLE_get_repr(INTERP, slurpy_pos));
49 49
 
50 50
         RETURN(int 1000, STRING *kevin);
51 51
     }
@@ -53,8 +53,8 @@ pmclass PCCMETHOD_Test dynpmc provides hash {
53 53
     METHOD test_method3(PMC *a1 :named("a1name"), PMC *a2  :named("a2name"))
54 54
     {
55 55
         UNUSED(SELF);
56  
-        Parrot_io_printf(interp, "test_method3\n");
57  
-        Parrot_io_printf(interp, "%Ps, %Ps\n", a1, a2);
  56
+        Parrot_io_printf(INTERP, "test_method3\n");
  57
+        Parrot_io_printf(INTERP, "%Ps, %Ps\n", a1, a2);
58 58
     }
59 59
 
60 60
     METHOD test_method4(int george :optional, int g_f :opt_flag,
@@ -65,7 +65,7 @@ pmclass PCCMETHOD_Test dynpmc provides hash {
65 65
         UNUSED(g_f);
66 66
         UNUSED(slurpy_pos);
67 67
         UNUSED(slurpy_named);
68  
-        Parrot_io_printf(interp, "test_method4\n");
  68
+        Parrot_io_printf(INTERP, "test_method4\n");
69 69
     }
70 70
 }
71 71
 
20  src/dynpmc/subproxy.pmc
@@ -34,22 +34,22 @@ pmclass SubProxy dynpmc extends Sub auto_attrs {
34 34
             Parrot_Sub_attributes  *rsub,     *my_sub;
35 35
 
36 36
             if (!key)
37  
-                Parrot_ex_throw_from_c_args(interp, NULL, 1, "SubProxy: no key");
  37
+                Parrot_ex_throw_from_c_args(INTERP, NULL, 1, "SubProxy: no key");
38 38
 
39  
-            file = VTABLE_get_string(interp, key);
  39
+            file = VTABLE_get_string(INTERP, key);
40 40
             if (!file)
41  
-                Parrot_ex_throw_from_c_args(interp, NULL, 1, "SubProxy: no file");
  41
+                Parrot_ex_throw_from_c_args(INTERP, NULL, 1, "SubProxy: no file");
42 42
 
43  
-            sub_pmc = key_next(interp, key);
  43
+            sub_pmc = key_next(INTERP, key);
44 44
             if (!sub_pmc)
45  
-                Parrot_ex_throw_from_c_args(interp, NULL, 1, "SubProxy: no sub");
  45
+                Parrot_ex_throw_from_c_args(INTERP, NULL, 1, "SubProxy: no sub");
46 46
 
47  
-            Parrot_load_bytecode(interp, file);
48  
-            rsub_pmc = VTABLE_get_pmc_keyed(interp,
49  
-                    interp->root_namespace, sub_pmc);
  47
+            Parrot_load_bytecode(INTERP, file);
  48
+            rsub_pmc = VTABLE_get_pmc_keyed(INTERP,
  49
+                    INTERP->root_namespace, sub_pmc);
50 50
 
51  
-            if (!VTABLE_defined(interp, rsub_pmc))
52  
-                Parrot_ex_throw_from_c_args(interp, NULL, 1,
  51
+            if (!VTABLE_defined(INTERP, rsub_pmc))
  52
+                Parrot_ex_throw_from_c_args(INTERP, NULL, 1,
53 53
                     "SubProxy: sub not found");
54 54
 
55 55
             PObj_get_FLAGS(SELF) &= ~PObj_private0_FLAG;
7  src/oo.c
@@ -433,10 +433,9 @@ Parrot_oo_find_vtable_override_for_class(PARROT_INTERP,
433 433
         ARGIN(PMC *classobj), ARGIN(STRING *name))
434 434
 {
435 435
     ASSERT_ARGS(Parrot_oo_find_vtable_override_for_class)
436  
-    Parrot_Class_attributes *class_info;
  436
+    const Parrot_Class_attributes * const class_info = PARROT_CLASS(classobj);;
437 437
     PARROT_ASSERT(PObj_is_class_TEST(classobj));
438 438
 
439  
-    class_info = PARROT_CLASS(classobj);
440 439
     return VTABLE_get_pmc_keyed_str(interp, class_info->vtable_overrides, name);
441 440
 }
442 441
 
@@ -802,8 +801,8 @@ static void
802 801
 invalidate_all_caches(PARROT_INTERP)
803 802
 {
804 803
     ASSERT_ARGS(invalidate_all_caches)
805  
-    UINTVAL i;
806  
-    for (i = 1; i < (UINTVAL)interp->n_vtable_max; ++i)
  804
+    int i;
  805
+    for (i = 1; i < interp->n_vtable_max; ++i)
807 806
         invalidate_type_caches(interp, i);
808 807
 }
809 808
 
12  src/pmc/addrregistry.pmc
@@ -77,7 +77,7 @@ Returns true if the hash size is not zero.
77 77
         Hash       *hash;
78 78
         const void *value;
79 79
 
80  
-        GET_ATTR_hash(interp, SELF, hash);
  80
+        GET_ATTR_hash(INTERP, SELF, hash);
81 81
         value = parrot_hash_get(INTERP, hash, key);
82 82
 
83 83
         if (value)
@@ -89,7 +89,7 @@ Returns true if the hash size is not zero.
89 89
     VTABLE INTVAL elements() {
90 90
         const Hash *hash;
91 91
 
92  
-        GET_ATTR_hash(interp, SELF, hash);
  92
+        GET_ATTR_hash(INTERP, SELF, hash);
93 93
 
94 94
         return parrot_hash_size(INTERP, hash);
95 95
     }
@@ -97,7 +97,7 @@ Returns true if the hash size is not zero.
97 97
     VTABLE INTVAL get_bool() {
98 98
         const Hash *hash;
99 99
 
100  
-        GET_ATTR_hash(interp, SELF, hash);
  100
+        GET_ATTR_hash(INTERP, SELF, hash);
101 101
 
102 102
         return parrot_hash_size(INTERP, hash) != 0;
103 103
     }
@@ -128,7 +128,7 @@ reaches 0, delete the entry.
128 128
         Hash       *hash;
129 129
         UNUSED(value);
130 130
 
131  
-        GET_ATTR_hash(interp, SELF, hash);
  131
+        GET_ATTR_hash(INTERP, SELF, hash);
132 132
 
133 133
         oldval = parrot_hash_get(INTERP, hash, key);
134 134
 
@@ -140,7 +140,7 @@ reaches 0, delete the entry.
140 140
 
141 141
     VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
142 142
         Hash *hash;
143  
-        GET_ATTR_hash(interp, SELF, hash);
  143
+        GET_ATTR_hash(INTERP, SELF, hash);
144 144
         parrot_hash_put(INTERP, hash, key, (void *)value);
145 145
     }
146 146
 
@@ -148,7 +148,7 @@ reaches 0, delete the entry.
148 148
         Hash       *hash;
149 149
         void       *value;
150 150
 
151  
-        GET_ATTR_hash(interp, SELF, hash);
  151
+        GET_ATTR_hash(INTERP, SELF, hash);
152 152
         value = parrot_hash_get(INTERP, hash, key);
153 153
 
154 154
         /* these casts look bad, but they avoid type punning warnings with -O */
36  src/pmc/arrayiterator.pmc
@@ -90,7 +90,7 @@ Defaults iteration mode to iterate from start.
90 90
 
91 91
     VTABLE void init_pmc(PMC *array) {
92 92
 
93  
-        SET_ATTR_array(interp, SELF, array);
  93
+        SET_ATTR_array(INTERP, SELF, array);
94 94
 
95 95
         PObj_custom_mark_SET(SELF);
96 96
 
@@ -128,14 +128,14 @@ Marks the current idx/key and the aggregate as live.
128 128
         PMC   *array;
129 129
         PMC   *clone;
130 130
 
131  
-        GET_ATTR_array(interp, SELF, array);
132  
-        GET_ATTR_pos(interp, SELF, pos);
133  
-        GET_ATTR_reverse(interp, SELF, reverse);
  131
+        GET_ATTR_array(INTERP, SELF, array);
  132
+        GET_ATTR_pos(INTERP, SELF, pos);
  133
+        GET_ATTR_reverse(INTERP, SELF, reverse);
134 134
 
135 135
         clone = Parrot_pmc_new_init(INTERP, enum_class_ArrayIterator, array);
136 136
 
137  
-        SET_ATTR_pos(interp, clone, pos);
138  
-        SET_ATTR_reverse(interp, clone, reverse);
  137
+        SET_ATTR_pos(INTERP, clone, pos);
  138
+        SET_ATTR_reverse(INTERP, clone, reverse);
139 139
 
140 140
         return clone;
141 141
     }
@@ -167,15 +167,15 @@ Returns the number of remaining elements in the array.
167 167
     VTABLE INTVAL elements() {
168 168
         INTVAL reverse, pos, length;
169 169
 
170  
-        GET_ATTR_reverse(interp, SELF, reverse);
  170
+        GET_ATTR_reverse(INTERP, SELF, reverse);
171 171
 
172 172
         if (reverse) {
173  
-            GET_ATTR_pos(interp, SELF, pos);
  173
+            GET_ATTR_pos(INTERP, SELF, pos);
174 174
             return pos;
175 175
         }
176 176
         else {
177  
-            GET_ATTR_length(interp, SELF, length);
178  
-            GET_ATTR_pos(interp, SELF, pos);
  177
+            GET_ATTR_length(INTERP, SELF, length);
  178
+            GET_ATTR_pos(INTERP, SELF, pos);
179 179
             return length - pos;
180 180
         }
181 181
     }
@@ -201,18 +201,18 @@ Reset the Iterator. C<value> must be one of
201 201
         PMC *array;
202 202
 
203 203
         if (value == ITERATE_FROM_START) {
204  
-            GET_ATTR_array(interp, SELF, array);
205  
-            SET_ATTR_reverse(interp, SELF, 0);
206  
-            SET_ATTR_pos(interp, SELF, 0);
207  
-            SET_ATTR_length(interp, SELF, VTABLE_elements(INTERP, array));
  204
+            GET_ATTR_array(INTERP, SELF, array);
  205
+            SET_ATTR_reverse(INTERP, SELF, 0);
  206
+            SET_ATTR_pos(INTERP, SELF, 0);
  207
+            SET_ATTR_length(INTERP, SELF, VTABLE_elements(INTERP, array));
208 208
         }
209 209
         else if (value == ITERATE_FROM_END) {
210 210
             INTVAL element;
211  
-            GET_ATTR_array(interp, SELF, array);
  211
+            GET_ATTR_array(INTERP, SELF, array);
212 212
             element = VTABLE_elements(INTERP, array);
213  
-            SET_ATTR_reverse(interp, SELF, 1);
214  
-            SET_ATTR_length(interp, SELF, element);
215  
-            SET_ATTR_pos(interp, SELF, element);
  213
+            SET_ATTR_reverse(INTERP, SELF, 1);
  214
+            SET_ATTR_length(INTERP, SELF, element);
  215
+            SET_ATTR_pos(INTERP, SELF, element);
216 216
         }
217 217
         else
218 218
             Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_INVALID_OPERATION,
56  src/pmc/bigint.pmc
@@ -1183,7 +1183,7 @@ Decrements the integer.
1183 1183
     MULTI PMC *add(Integer value, PMC *dest) {
1184 1184
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1185 1185
 
1186  
-        bigint_add_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1186
+        bigint_add_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1187 1187
         return dest;
1188 1188
     }
1189 1189
 
@@ -1192,7 +1192,7 @@ Decrements the integer.
1192 1192
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1193 1193
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1194 1194
             "BigInt: no multiple dispatch variant 'add' for %Ss",
1195  
-            VTABLE_name(interp, value));
  1195
+            VTABLE_name(INTERP, value));
1196 1196
     }
1197 1197
 
1198 1198
     VTABLE PMC *add_int(INTVAL value, PMC *dest) {
@@ -1207,14 +1207,14 @@ Decrements the integer.
1207 1207
     }
1208 1208
 
1209 1209
     MULTI void i_add(Integer value) {
1210  
-        bigint_add_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1210
+        bigint_add_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1211 1211
     }
1212 1212
 
1213 1213
     MULTI void i_add(DEFAULT value) {
1214 1214
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1215 1215
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1216 1216
             "BigInt: no multiple dispatch variant 'i_add' for %Ss",
1217  
-            VTABLE_name(interp, value));
  1217
+            VTABLE_name(INTERP, value));
1218 1218
     }
1219 1219
 
1220 1220
     VTABLE void i_add_int(INTVAL value) {
@@ -1239,7 +1239,7 @@ Decrements the integer.
1239 1239
     MULTI PMC *subtract(Integer value, PMC *dest) {
1240 1240
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1241 1241
 
1242  
-        bigint_sub_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1242
+        bigint_sub_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1243 1243
         return dest;
1244 1244
     }
1245 1245
 
@@ -1248,7 +1248,7 @@ Decrements the integer.
1248 1248
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1249 1249
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1250 1250
             "BigInt: no multiple dispatch variant 'subtract' for %Ss",
1251  
-            VTABLE_name(interp, value));
  1251
+            VTABLE_name(INTERP, value));
1252 1252
     }
1253 1253
 
1254 1254
     VTABLE PMC *subtract_int(INTVAL value, PMC *dest) {
@@ -1263,14 +1263,14 @@ Decrements the integer.
1263 1263
     }
1264 1264
 
1265 1265
     MULTI void i_subtract(Integer value) {
1266  
-        bigint_sub_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1266
+        bigint_sub_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1267 1267
     }
1268 1268
 
1269 1269
     MULTI void i_subtract(DEFAULT value) {
1270 1270
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1271 1271
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1272 1272
             "BigInt: no multiple dispatch variant 'i_subtract' for %Ss",
1273  
-            VTABLE_name(interp, value));
  1273
+            VTABLE_name(INTERP, value));
1274 1274
     }
1275 1275
 
1276 1276
     VTABLE void i_subtract_int(INTVAL value) {
@@ -1295,7 +1295,7 @@ Decrements the integer.
1295 1295
     MULTI PMC *multiply(Integer value, PMC *dest) {
1296 1296
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1297 1297
 
1298  
-        bigint_mul_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1298
+        bigint_mul_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1299 1299
         return dest;
1300 1300
     }
1301 1301
 
@@ -1304,7 +1304,7 @@ Decrements the integer.
1304 1304
          Parrot_ex_throw_from_c_args(INTERP, NULL,
1305 1305
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1306 1306
             "BigInt: no multiple dispatch variant 'multiply' for %Ss",
1307  
-            VTABLE_name(interp, value));
  1307
+            VTABLE_name(INTERP, value));
1308 1308
     }
1309 1309
 
1310 1310
     VTABLE PMC *multiply_int(INTVAL value, PMC *dest) {
@@ -1318,13 +1318,13 @@ Decrements the integer.
1318 1318
         bigint_mul_bigint(INTERP, SELF, value, SELF);
1319 1319
     }
1320 1320
     MULTI void i_multiply(Integer value) {
1321  
-        bigint_mul_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1321
+        bigint_mul_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1322 1322
     }
1323 1323
     MULTI void i_multiply(DEFAULT value) {
1324 1324
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1325 1325
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1326 1326
             "BigInt: no multiple dispatch variant 'i_multiply' for %Ss",
1327  
-            VTABLE_name(interp, value));
  1327
+            VTABLE_name(INTERP, value));
1328 1328
     }
1329 1329
 
1330 1330
     VTABLE void i_multiply_int(INTVAL value) {
@@ -1358,7 +1358,7 @@ Decrements the integer.
1358 1358
     MULTI PMC *divide(Integer value, PMC *dest) {
1359 1359
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1360 1360
 
1361  
-        bigint_div_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1361
+        bigint_div_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1362 1362
         return dest;
1363 1363
     }
1364 1364
 
@@ -1367,7 +1367,7 @@ Decrements the integer.
1367 1367
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1368 1368
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1369 1369
             "BigInt: no multiple dispatch variant 'divide' for %Ss",
1370  
-            VTABLE_name(interp, value));
  1370
+            VTABLE_name(INTERP, value));
1371 1371
     }
1372 1372
 
1373 1373
     VTABLE PMC *divide_int(INTVAL value, PMC *dest) {
@@ -1381,13 +1381,13 @@ Decrements the integer.
1381 1381
         bigint_div_bigint(INTERP, SELF, value, SELF);
1382 1382
     }
1383 1383
     MULTI void i_divide(Integer value) {
1384  
-        bigint_div_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1384
+        bigint_div_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1385 1385
     }
1386 1386
     MULTI void i_divide(DEFAULT value) {
1387 1387
          Parrot_ex_throw_from_c_args(INTERP, NULL,
1388 1388
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1389 1389
             "BigInt: no multiple dispatch variant 'i_divide' for %Ss",
1390  
-            VTABLE_name(interp, value));
  1390
+            VTABLE_name(INTERP, value));
1391 1391
     }
1392 1392
 
1393 1393
     VTABLE void i_divide_int(INTVAL value) {
@@ -1404,7 +1404,7 @@ Decrements the integer.
1404 1404
     MULTI PMC *floor_divide(Integer value, PMC *dest) {
1405 1405
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1406 1406
 
1407  
-        bigint_fdiv_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1407
+        bigint_fdiv_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1408 1408
         return dest;
1409 1409
     }
1410 1410
 
@@ -1413,7 +1413,7 @@ Decrements the integer.
1413 1413
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1414 1414
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1415 1415
             "BigInt: no multiple dispatch variant 'floor_divide' for %Ss",
1416  
-            VTABLE_name(interp, value));
  1416
+            VTABLE_name(INTERP, value));
1417 1417
     }
1418 1418
 
1419 1419
     VTABLE PMC *floor_divide_int(INTVAL value, PMC *dest) {
@@ -1428,14 +1428,14 @@ Decrements the integer.
1428 1428
     }
1429 1429
 
1430 1430
     MULTI void i_floor_divide(Integer value) {
1431  
-        bigint_fdiv_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1431
+        bigint_fdiv_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1432 1432
     }
1433 1433
 
1434 1434
     MULTI void i_floor_divide(DEFAULT value) {
1435 1435
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1436 1436
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1437 1437
             "BigInt: no multiple dispatch variant 'i_floor_divide' for %Ss",
1438  
-            VTABLE_name(interp, value));
  1438
+            VTABLE_name(INTERP, value));
1439 1439
     }
1440 1440
 
1441 1441
     VTABLE void i_floor_divide_int(INTVAL value) {
@@ -1452,7 +1452,7 @@ Decrements the integer.
1452 1452
     MULTI PMC *modulus(Integer value, PMC *dest) {
1453 1453
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1454 1454
 
1455  
-        bigint_mod_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1455
+        bigint_mod_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1456 1456
         return dest;
1457 1457
     }
1458 1458
 
@@ -1461,20 +1461,20 @@ Decrements the integer.
1461 1461
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1462 1462
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1463 1463
             "BigInt: no multiple dispatch variant 'modulus' for %Ss",
1464  
-            VTABLE_name(interp, value));
  1464
+            VTABLE_name(INTERP, value));
1465 1465
     }
1466 1466
 
1467 1467
     MULTI void i_modulus(BigInt value) {
1468 1468
         bigint_mod_bigint(INTERP, SELF, value, SELF);
1469 1469
     }
1470 1470
     MULTI void i_modulus(Integer value) {
1471  
-        bigint_mod_bigint_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1471
+        bigint_mod_bigint_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1472 1472
     }
1473 1473
     MULTI void i_modulus(DEFAULT value) {
1474 1474
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1475 1475
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1476 1476
             "BigInt: no multiple dispatch variant 'i_modulus' for %Ss",
1477  
-            VTABLE_name(interp, value));
  1477
+            VTABLE_name(INTERP, value));
1478 1478
     }
1479 1479
 
1480 1480
     MULTI INTVAL cmp(BigInt value) {
@@ -1482,14 +1482,14 @@ Decrements the integer.
1482 1482
     }
1483 1483
 
1484 1484
     MULTI INTVAL cmp(Integer value) {
1485  
-        return bigint_cmp_int(INTERP, SELF, VTABLE_get_integer(interp, value));
  1485
+        return bigint_cmp_int(INTERP, SELF, VTABLE_get_integer(INTERP, value));
1486 1486
     }
1487 1487
 
1488 1488
     MULTI INTVAL cmp(DEFAULT value) {
1489 1489
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1490 1490
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1491 1491
             "BigInt: no multiple dispatch variant 'cmp' for %Ss",
1492  
-            VTABLE_name(interp, value));
  1492
+            VTABLE_name(INTERP, value));
1493 1493
     }
1494 1494
 
1495 1495
     MULTI INTVAL is_equal(BigInt value) {
@@ -1497,14 +1497,14 @@ Decrements the integer.
1497 1497
     }
1498 1498
 
1499 1499
     MULTI INTVAL is_equal(Integer value) {
1500  
-        return bigint_cmp_int(INTERP, SELF, VTABLE_get_integer(interp, value)) == 0;
  1500
+        return bigint_cmp_int(INTERP, SELF, VTABLE_get_integer(INTERP, value)) == 0;
1501 1501
     }
1502 1502
 
1503 1503
     MULTI INTVAL is_equal(DEFAULT value) {
1504 1504
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1505 1505
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1506 1506
             "BigInt: no multiple dispatch variant 'is_equal' for %Ss",
1507  
-            VTABLE_name(interp, value));
  1507
+            VTABLE_name(INTERP, value));
1508 1508
     }
1509 1509
 
1510 1510
 /*
56  src/pmc/bignum.pmc
@@ -1442,7 +1442,7 @@ Trunc the BigNum to an BigInt.
1442 1442
 #if PARROT_BIGNUM_CAN_BIGINT
1443 1443
         return bignum_get_bigint(INTERP, SELF);
1444 1444
 #else
1445  
-        Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_LIBRARY_ERROR,
  1445
+        Parrot_ex_throw_from_c_args(INTERP, NULL, EXCEPTION_LIBRARY_ERROR,
1446 1446
             "no bigint support in bignum");
1447 1447
 #endif
1448 1448
     }
@@ -1488,27 +1488,27 @@ appended.
1488 1488
     VTABLE STRING *get_string() {
1489 1489
         char   *s  = bignum_get_string(INTERP, SELF, 10);
1490 1490
         STRING *ps = Parrot_str_new(INTERP, s, 0);
1491  
-        mem_gc_free(interp, s);
  1491
+        mem_gc_free(INTERP, s);
1492 1492
         return ps;
1493 1493
     }
1494 1494
 
1495 1495
     VTABLE STRING *get_string_keyed_int(INTVAL base) {
1496 1496
         char   *s  = bignum_get_string(INTERP, SELF, base);
1497 1497
         STRING *ps = Parrot_str_new(INTERP, s, 0);
1498  
-        mem_gc_free(interp, s);
  1498
+        mem_gc_free(INTERP, s);
1499 1499
         return ps;
1500 1500
     }
1501 1501
 
1502 1502
     VTABLE STRING *get_string_keyed_int_int(INTVAL base, INTVAL digits) {
1503 1503
         char   *s  = bignum_get_string_size(INTERP, SELF, base, digits);
1504 1504
         STRING *ps = Parrot_str_new(INTERP, s, 0);
1505  
-        mem_gc_free(interp, s);
  1505
+        mem_gc_free(INTERP, s);
1506 1506
         return ps;
1507 1507
     }
1508 1508
 
1509 1509
     VTABLE STRING *get_repr() {
1510 1510
         STRING *s = SELF.get_string();
1511  
-        return Parrot_str_concat(INTERP, s, Parrot_str_new(interp, "N", 1));
  1511
+        return Parrot_str_concat(INTERP, s, Parrot_str_new(INTERP, "N", 1));
1512 1512
     }
1513 1513
 /*
1514 1514
 
@@ -1556,7 +1556,7 @@ Decrement the BigNum by 1.0.
1556 1556
     MULTI PMC *add(Integer value, PMC *dest) {
1557 1557
         dest = Parrot_pmc_new(INTERP, SELF->vtable->base_type);
1558 1558
 
1559  
-        bignum_add_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1559
+        bignum_add_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1560 1560
         return dest;
1561 1561
     }
1562 1562
 
@@ -1564,7 +1564,7 @@ Decrement the BigNum by 1.0.
1564 1564
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1565 1565
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1566 1566
             "BigNum: no multiple dispatch variant 'add' for %Ss",
1567  
-            VTABLE_name(interp, value));
  1567
+            VTABLE_name(INTERP, value));
1568 1568
     }
1569 1569
 
1570 1570
     VTABLE PMC *add_int(INTVAL value, PMC *dest) {
@@ -1590,7 +1590,7 @@ Decrement the BigNum by 1.0.
1590 1590
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1591 1591
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1592 1592
             "BigNum: no multiple dispatch variant 'i_add' for %Ss",
1593  
-            VTABLE_name(interp, value));
  1593
+            VTABLE_name(INTERP, value));
1594 1594
     }
1595 1595
 
1596 1596
     VTABLE void i_add_int(INTVAL value) {
@@ -1619,7 +1619,7 @@ Decrement the BigNum by 1.0.
1619 1619
     MULTI PMC *subtract(Integer value, PMC *dest) {
1620 1620
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1621 1621
 
1622  
-        bignum_sub_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1622
+        bignum_sub_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1623 1623
         return dest;
1624 1624
     }
1625 1625
 
@@ -1627,7 +1627,7 @@ Decrement the BigNum by 1.0.
1627 1627
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1628 1628
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1629 1629
             "BigNum: no multiple dispatch variant 'subtract' for %Ss",
1630  
-            VTABLE_name(interp, value));
  1630
+            VTABLE_name(INTERP, value));
1631 1631
     }
1632 1632
 
1633 1633
     VTABLE PMC *subtract_int(INTVAL value, PMC *dest) {
@@ -1653,7 +1653,7 @@ Decrement the BigNum by 1.0.
1653 1653
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1654 1654
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1655 1655
             "BigNum: no multiple dispatch variant 'i_subtract' for %Ss",
1656  
-            VTABLE_name(interp, value));
  1656
+            VTABLE_name(INTERP, value));
1657 1657
     }
1658 1658
 
1659 1659
     VTABLE void i_subtract_int(INTVAL value) {
@@ -1682,7 +1682,7 @@ Decrement the BigNum by 1.0.
1682 1682
     MULTI PMC *multiply(Integer value, PMC *dest) {
1683 1683
         dest = Parrot_pmc_new(INTERP, SELF->vtable->base_type);
1684 1684
 
1685  
-        bignum_mul_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1685
+        bignum_mul_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1686 1686
         return dest;
1687 1687
     }
1688 1688
 
@@ -1690,7 +1690,7 @@ Decrement the BigNum by 1.0.
1690 1690
          Parrot_ex_throw_from_c_args(INTERP, NULL,
1691 1691
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1692 1692
             "BigNum: no multiple dispatch variant 'multiply' for %Ss",
1693  
-            VTABLE_name(interp, value));
  1693
+            VTABLE_name(INTERP, value));
1694 1694
     }
1695 1695
 
1696 1696
     VTABLE PMC *multiply_int(INTVAL value, PMC *dest) {
@@ -1709,14 +1709,14 @@ Decrement the BigNum by 1.0.
1709 1709
     }
1710 1710
 
1711 1711
     MULTI void i_multiply(Integer value) {
1712  
-        bignum_mul_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1712
+        bignum_mul_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1713 1713
     }
1714 1714
 
1715 1715
     MULTI void i_multiply(DEFAULT value) {
1716 1716
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1717 1717
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1718 1718
             "BigNum: no multiple dispatch variant 'i_multiply' for %Ss",
1719  
-            VTABLE_name(interp, value));
  1719
+            VTABLE_name(INTERP, value));
1720 1720
     }
1721 1721
 
1722 1722
     VTABLE void i_multiply_int(INTVAL value) {
@@ -1768,7 +1768,7 @@ TODO: Only supports Integer values for now.
1768 1768
     MULTI PMC *divide(Integer value, PMC *dest) {
1769 1769
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1770 1770
 
1771  
-        bignum_div_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1771
+        bignum_div_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1772 1772
         return dest;
1773 1773
     }
1774 1774
 
@@ -1776,7 +1776,7 @@ TODO: Only supports Integer values for now.
1776 1776
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1777 1777
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1778 1778
             "BigNum: no multiple dispatch variant 'divide' for %Ss",
1779  
-            VTABLE_name(interp, value));
  1779
+            VTABLE_name(INTERP, value));
1780 1780
     }
1781 1781
 
1782 1782
     VTABLE PMC *divide_int(INTVAL value, PMC *dest) {
@@ -1797,16 +1797,16 @@ TODO: Only supports Integer values for now.
1797 1797
         bignum_div_bignum(INTERP, SELF, value, SELF);
1798 1798
     }
1799 1799
     MULTI void i_divide(Integer value) {
1800  
-        bignum_div_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1800
+        bignum_div_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1801 1801
     }
1802 1802
     MULTI void i_divide(Float value) {
1803  
-        bignum_div_bignum_float(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1803
+        bignum_div_bignum_float(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1804 1804
     }
1805 1805
     MULTI void i_divide(DEFAULT value) {
1806 1806
          Parrot_ex_throw_from_c_args(INTERP, NULL,
1807 1807
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1808 1808
             "BigNum: no multiple dispatch variant 'i_divide' for %Ss",
1809  
-            VTABLE_name(interp, value));
  1809
+            VTABLE_name(INTERP, value));
1810 1810
     }
1811 1811
 
1812 1812
     VTABLE void i_divide_int(INTVAL value) {
@@ -1831,7 +1831,7 @@ TODO: Only supports Integer values for now.
1831 1831
     MULTI PMC *floor_divide(Integer value, PMC *dest) {
1832 1832
         dest = Parrot_pmc_new(INTERP, VTABLE_type(INTERP, SELF));
1833 1833
 
1834  
-        bignum_fdiv_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), dest);
  1834
+        bignum_fdiv_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), dest);
1835 1835
         return dest;
1836 1836
     }
1837 1837
 
@@ -1839,7 +1839,7 @@ TODO: Only supports Integer values for now.
1839 1839
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1840 1840
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1841 1841
             "BigNum: no multiple dispatch variant 'floor_divide' for %Ss",
1842  
-            VTABLE_name(interp, value));
  1842
+            VTABLE_name(INTERP, value));
1843 1843
     }
1844 1844
 
1845 1845
     VTABLE PMC *floor_divide_int(INTVAL value, PMC *dest) {
@@ -1854,14 +1854,14 @@ TODO: Only supports Integer values for now.
1854 1854
     }
1855 1855
 
1856 1856
     MULTI void i_floor_divide(Integer value) {
1857  
-        bignum_fdiv_bignum_int(INTERP, SELF, VTABLE_get_integer(interp, value), SELF);
  1857
+        bignum_fdiv_bignum_int(INTERP, SELF, VTABLE_get_integer(INTERP, value), SELF);
1858 1858
     }
1859 1859
 
1860 1860
     MULTI void i_floor_divide(DEFAULT value) {
1861 1861
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1862 1862
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1863 1863
             "BigNum: no multiple dispatch variant 'i_floor_divide' for %Ss",
1864  
-            VTABLE_name(interp, value));
  1864
+            VTABLE_name(INTERP, value));
1865 1865
     }
1866 1866
 
1867 1867
     VTABLE void i_floor_divide_int(INTVAL value) {
@@ -1881,14 +1881,14 @@ TODO: Only supports Integer values for now.
1881 1881
     }
1882 1882
 
1883 1883
     MULTI INTVAL cmp(Integer value) {
1884  
-        return bignum_cmp_int(INTERP, SELF, VTABLE_get_integer(interp, value));
  1884
+        return bignum_cmp_int(INTERP, SELF, VTABLE_get_integer(INTERP, value));
1885 1885
     }
1886 1886
 
1887 1887
     MULTI INTVAL cmp(DEFAULT value) {
1888 1888
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1889 1889
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1890 1890
             "BigNum: no multiple dispatch variant 'cmp' for %Ss",
1891  
-            VTABLE_name(interp, value));
  1891
+            VTABLE_name(INTERP, value));
1892 1892
     }
1893 1893
 
1894 1894
 /*
@@ -1904,14 +1904,14 @@ TODO: Only supports Integer values for now.
1904 1904
     }
1905 1905
 
1906 1906
     MULTI INTVAL is_equal(Integer value) {
1907  
-        return bignum_cmp_int(INTERP, SELF, VTABLE_get_integer(interp, value)) == 0;
  1907
+        return bignum_cmp_int(INTERP, SELF, VTABLE_get_integer(INTERP, value)) == 0;
1908 1908
     }
1909 1909
 
1910 1910
     MULTI INTVAL is_equal(DEFAULT value) {
1911 1911
         Parrot_ex_throw_from_c_args(INTERP, NULL,
1912 1912
             EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
1913 1913
             "BigNum: no multiple dispatch variant 'is_equal' for %Ss",
1914  
-            VTABLE_name(interp, value));
  1914
+            VTABLE_name(INTERP, value));
1915 1915
     }
1916 1916
 
1917 1917
 /*
46  src/pmc/callcontext.pmc
@@ -539,13 +539,13 @@ Mark any referenced strings and PMCs.
539 539
             PMC * const p = bp_ps.regs_p[-1L-(i)];
540 540
             /* Original code from CTX_REG_PMC */
541 541
             if (p)
542  
-                Parrot_gc_mark_PMC_alive(interp, p);
  542
+                Parrot_gc_mark_PMC_alive(INTERP, p);
543 543
         }
544 544
 
545 545
         for (i = 0; i < n_regs_used[REGNO_STR]; ++i) {
546 546
             STRING * const s = bp_ps.regs_s[i];
547 547
             if (s)
548  
-                Parrot_gc_mark_STRING_alive(interp, s);
  548
+                Parrot_gc_mark_STRING_alive(INTERP, s);
549 549
         }
550 550
     }
551 551
 
@@ -589,7 +589,7 @@ stored.)
589 589
             }
590 590
 
591 591
             parrot_hash_destroy(INTERP, hash);
592  
-            SET_ATTR_hash(interp, SELF, NULL);
  592
+            SET_ATTR_hash(INTERP, SELF, NULL);
593 593
         }
594 594
     }
595 595
 
@@ -736,7 +736,7 @@ CallContext.
736 736
             GET_ATTR_positionals(INTERP, SELF, c);
737 737
             GET_ATTR_num_positionals(INTERP, SELF, num_positionals);
738 738
 
739  
-            type_tuple = Parrot_pmc_new_init_int(interp,
  739
+            type_tuple = Parrot_pmc_new_init_int(INTERP,
740 740
                 enum_class_FixedIntegerArray, num_positionals);
741 741
 
742 742
             for (i = 0; i < num_positionals; ++i) {
@@ -749,15 +749,15 @@ CallContext.
749 749
                     case PMCCELL:
750 750
                         type = PMC_IS_NULL(c[i].u.p)
751 751
                              ? (INTVAL) enum_type_PMC
752  
-                             : VTABLE_type(interp, c[i].u.p);
  752
+                             : VTABLE_type(INTERP, c[i].u.p);
753 753
                         break;
754 754
                     default:
755  
-                        Parrot_ex_throw_from_c_args(interp, NULL,
  755
+                        Parrot_ex_throw_from_c_args(INTERP, NULL,
756 756
                             EXCEPTION_INVALID_OPERATION,
757 757
                             "Multiple Dispatch: invalid argument type!");
758 758
                 }
759 759
 
760  
-                VTABLE_set_integer_keyed_int(interp, type_tuple, i, type);
  760
+                VTABLE_set_integer_keyed_int(INTERP, type_tuple, i, type);
761 761
             }
762 762
 
763 763
             SET_ATTR_type_tuple(INTERP, SELF, type_tuple);
@@ -931,7 +931,7 @@ return current Namespace
931 931
         INTVAL    num_pos, allocated_positionals;
932 932
 
933 933
         GET_ATTR_num_positionals(INTERP, SELF, num_pos);
934  
-        GET_ATTR_allocated_positionals(interp, SELF, allocated_positionals);
  934
+        GET_ATTR_allocated_positionals(INTERP, SELF, allocated_positionals);
935 935
 
936 936
         if (num_pos + 1 > allocated_positionals)
937 937
             ensure_positionals_storage(INTERP, SELF, num_pos + 1);
@@ -973,7 +973,7 @@ return current Namespace
973 973
         INTVAL    num_pos, allocated_positionals;
974 974
 
975 975
         GET_ATTR_num_positionals(INTERP, SELF, num_pos);
976  
-        GET_ATTR_allocated_positionals(interp, SELF, allocated_positionals);
  976
+        GET_ATTR_allocated_positionals(INTERP, SELF, allocated_positionals);
977 977
 
978 978
         if (num_pos + 1 > allocated_positionals)
979 979
             ensure_positionals_storage(INTERP, SELF, num_pos + 1);
@@ -991,7 +991,7 @@ return current Namespace
991 991
 
992 992
     VTABLE void unshift_pmc(PMC *value) {
993 993
         Pcc_cell *cells;
994  
-        INTVAL size = STATICSELF.elements();
  994
+        const INTVAL size = STATICSELF.elements();
995 995
         INTVAL    i;
996 996
 
997 997
         ensure_positionals_storage(INTERP, SELF, size + 1);
@@ -1012,7 +1012,7 @@ return current Namespace