Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[pmc] Changed instances of io->vtable->whatever() to VTABLE_whatever(…

…) as

per RT#45281


git-svn-id: https://svn.parrot.org/parrot/trunk@21147 d31e2699-5ff4-0310-a27c-f18f2fbe73fe
  • Loading branch information...
commit 297024c63203404abc62217d01e9d995d49e2926 1 parent 10edc18
@paultcochrane paultcochrane authored
View
4 src/pmc/array.pmc
@@ -1248,7 +1248,7 @@ Used to archive the array.
void freeze(visit_info *info) {
IMAGE_IO * const io = info->image_io;
SUPER(info);
- io->vtable->push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
+ VTABLE_push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
}
/*
@@ -1266,7 +1266,7 @@ Used to unarchive the array.
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL) {
- DYNSELF.set_integer_native(io->vtable->shift_integer(INTERP, io));
+ DYNSELF.set_integer_native(VTABLE_shift_integer(INTERP, io));
}
}
View
4 src/pmc/eval.pmc
@@ -312,14 +312,14 @@ Unarchives the code.
void freeze(visit_info *info) {
IMAGE_IO *io = info->image_io;
STRING *packed = SELF.get_string();
- io->vtable->push_string(INTERP, io, packed);
+ VTABLE_push_string(INTERP, io, packed);
SUPER(info);
}
void thaw(visit_info *info) {
IMAGE_IO *io = info->image_io;
- STRING *packed = io->vtable->shift_string(INTERP, io);
+ STRING *packed = VTABLE_shift_string(INTERP, io);
PackFile *pf;
PackFile_Segment *seg;
size_t i;
View
8 src/pmc/fixedbooleanarray.pmc
@@ -480,8 +480,8 @@ Used to archive the string.
PMC_data_typed(SELF, char *),
PMC_int_val2(SELF) / BITS_PER_CHAR);
- io->vtable->push_integer(INTERP, io, PMC_int_val(SELF));
- io->vtable->push_string(INTERP, io, s);
+ VTABLE_push_integer(INTERP, io, PMC_int_val(SELF));
+ VTABLE_push_string(INTERP, io, s);
}
/*
@@ -498,8 +498,8 @@ Used to unarchive the string.
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL) {
- INTVAL size = io->vtable->shift_integer(INTERP, io);
- STRING *s = io->vtable->shift_string(INTERP, io);
+ INTVAL size = VTABLE_shift_integer(INTERP, io);
+ STRING *s = VTABLE_shift_string(INTERP, io);
PMC_int_val(SELF) = size;
PMC_int_val2(pmc) = s->bufused * BITS_PER_CHAR;
PMC_data(pmc) = mem_sys_allocate_zeroed(s->bufused);
View
8 src/pmc/fixedintegerarray.pmc
@@ -582,18 +582,18 @@ Used to unarchive the array.
SUPER(info);
n = VTABLE_elements(INTERP, SELF);
- io->vtable->push_integer(INTERP, io, n);
+ VTABLE_push_integer(INTERP, io, n);
ar = (INTVAL *)PMC_data(SELF);
for (i = 0; i < n; ++i)
- io->vtable->push_integer(INTERP, io, ar[i]);
+ VTABLE_push_integer(INTERP, io, ar[i]);
}
void thaw(visit_info *info) {
IMAGE_IO *io = info->image_io;
if (info->extra_flags == EXTRA_IS_NULL) {
- INTVAL n = io->vtable->shift_integer(INTERP, io);
+ INTVAL n = VTABLE_shift_integer(INTERP, io);
INTVAL i;
INTVAL *ar;
@@ -607,7 +607,7 @@ Used to unarchive the array.
ar = (INTVAL *)PMC_data(SELF);
for (i = 0; i < n; ++i)
- ar[i] = io->vtable->shift_integer(INTERP, io);
+ ar[i] = VTABLE_shift_integer(INTERP, io);
}
else
SUPER(info);
View
4 src/pmc/fixedpmcarray.pmc
@@ -770,14 +770,14 @@ Used to unarchive the array.
void freeze(visit_info *info) {
IMAGE_IO *io = info->image_io;
SUPER(info);
- io->vtable->push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
+ VTABLE_push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
}
void thaw(visit_info *info) {
IMAGE_IO *io = info->image_io;
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL)
- DYNSELF.set_integer_native(io->vtable->shift_integer(INTERP, io));
+ DYNSELF.set_integer_native(VTABLE_shift_integer(INTERP, io));
}
/*
View
8 src/pmc/fixedstringarray.pmc
@@ -492,10 +492,10 @@ Used to archive the string.
const INTVAL n = PMC_int_val(SELF);
INTVAL i;
- io->vtable->push_integer(INTERP, io, n);
+ VTABLE_push_integer(INTERP, io, n);
for (i = 0; i < n; ++i)
- io->vtable->push_string(INTERP, io, data[i]);
+ VTABLE_push_string(INTERP, io, data[i]);
}
/*
@@ -517,12 +517,12 @@ Used to unarchive the string.
DYNSELF.init();
- n = io->vtable->shift_integer(INTERP, io);
+ n = VTABLE_shift_integer(INTERP, io);
DYNSELF.set_integer_native(n);
data = PMC_data_typed(SELF, STRING **);
for (i = 0; i < n; ++i)
- data[i] = io->vtable->shift_string(INTERP, io);
+ data[i] = VTABLE_shift_string(INTERP, io);
}
}
}
View
4 src/pmc/float.pmc
@@ -383,7 +383,7 @@ Used to archive the number.
void freeze(visit_info *info) {
IMAGE_IO * const io = info->image_io;
SUPER(info);
- io->vtable->push_float(INTERP, io, PMC_num_val(SELF));
+ VTABLE_push_float(INTERP, io, PMC_num_val(SELF));
}
/*
@@ -399,7 +399,7 @@ Used to unarchive the number.
IMAGE_IO * const io = info->image_io;
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL)
- PMC_num_val(SELF) = io->vtable->shift_float(INTERP, io);
+ PMC_num_val(SELF) = VTABLE_shift_float(INTERP, io);
}
/*
View
12 src/pmc/hash.pmc
@@ -1048,9 +1048,9 @@ Used to archive the hash.
Hash * const hash = (Hash *)PMC_struct_val(SELF);;
SUPER(info);
- io->vtable->push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
- io->vtable->push_integer(INTERP, io, hash->key_type);
- io->vtable->push_integer(INTERP, io, hash->entry_type);
+ VTABLE_push_integer(INTERP, io, VTABLE_elements(INTERP, SELF));
+ VTABLE_push_integer(INTERP, io, hash->key_type);
+ VTABLE_push_integer(INTERP, io, hash->entry_type);
}
/*
@@ -1068,9 +1068,9 @@ Used to unarchive the hash.
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL) {
- const INTVAL elems = io->vtable->shift_integer(INTERP, io);
- const INTVAL k_type = io->vtable->shift_integer(INTERP, io);
- const INTVAL v_type = io->vtable->shift_integer(INTERP, io);
+ const INTVAL elems = VTABLE_shift_integer(INTERP, io);
+ const INTVAL k_type = VTABLE_shift_integer(INTERP, io);
+ const INTVAL v_type = VTABLE_shift_integer(INTERP, io);
Hash *hash;
/* TODO make a better interface for hash creation
View
4 src/pmc/integer.pmc
@@ -1308,7 +1308,7 @@ Used to archive the integer.
void freeze(visit_info *info) {
IMAGE_IO * const io = info->image_io;
SUPER(info);
- io->vtable->push_integer(INTERP, io, PMC_int_val(SELF));
+ VTABLE_push_integer(INTERP, io, PMC_int_val(SELF));
}
/*
@@ -1324,7 +1324,7 @@ Used to unarchive the integer.
IMAGE_IO * const io = info->image_io;
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL)
- PMC_int_val(SELF) = io->vtable->shift_integer(INTERP, io);
+ PMC_int_val(SELF) = VTABLE_shift_integer(INTERP, io);
}
}
View
16 src/pmc/key.pmc
@@ -386,21 +386,21 @@ Called after the Key has been thawed: convert last PMC_NULL key to NULL.
/* write the contents of a register - else thaw can't restore
* the register state
*/
- io->vtable->push_integer(INTERP, io, flags & ~KEY_register_FLAG);
+ VTABLE_push_integer(INTERP, io, flags & ~KEY_register_FLAG);
/* and contents of this key component */
switch (flags) {
case KEY_integer_FLAG:
case KEY_integer_FLAG | KEY_register_FLAG:
- io->vtable->push_integer(INTERP, io, key_integer(INTERP, SELF));
+ VTABLE_push_integer(INTERP, io, key_integer(INTERP, SELF));
break;
case KEY_number_FLAG:
case KEY_number_FLAG | KEY_register_FLAG:
- io->vtable->push_float(INTERP, io, key_number(INTERP, SELF));
+ VTABLE_push_float(INTERP, io, key_number(INTERP, SELF));
break;
case KEY_string_FLAG:
case KEY_string_FLAG | KEY_register_FLAG:
- io->vtable->push_string(INTERP, io, key_string(INTERP, SELF));
+ VTABLE_push_string(INTERP, io, key_string(INTERP, SELF));
break;
default:
real_exception(INTERP, NULL, E_KeyError,
@@ -411,7 +411,7 @@ Called after the Key has been thawed: convert last PMC_NULL key to NULL.
void thaw(visit_info *info /*NN*/) {
IMAGE_IO * const io = info->image_io;
- INTVAL const flags = io->vtable->shift_integer(INTERP, io)
+ INTVAL const flags = VTABLE_shift_integer(INTERP, io)
& KEY_type_FLAGS;
PObj_get_FLAGS(SELF) |= flags;
@@ -420,13 +420,13 @@ Called after the Key has been thawed: convert last PMC_NULL key to NULL.
/* get contents */
switch (flags) {
case KEY_integer_FLAG:
- PMC_int_val(SELF) = io->vtable->shift_integer(INTERP, io);
+ PMC_int_val(SELF) = VTABLE_shift_integer(INTERP, io);
break;
case KEY_number_FLAG:
- PMC_num_val(SELF) = io->vtable->shift_float(INTERP, io);
+ PMC_num_val(SELF) = VTABLE_shift_float(INTERP, io);
break;
case KEY_string_FLAG:
- PMC_str_val(SELF) = io->vtable->shift_string(INTERP, io);
+ PMC_str_val(SELF) = VTABLE_shift_string(INTERP, io);
break;
default:
real_exception(INTERP, NULL, E_KeyError,
View
6 src/pmc/lexinfo.pmc
@@ -120,9 +120,9 @@ The implementation of the Hash PMC is called.
IMAGE_IO * const io = info->image_io;
if (info->extra_flags == EXTRA_IS_NULL) {
- const INTVAL elems = io->vtable->shift_integer(INTERP, io);
- const INTVAL k_type = io->vtable->shift_integer(INTERP, io);
- const INTVAL v_type = io->vtable->shift_integer(INTERP, io);
+ const INTVAL elems = VTABLE_shift_integer(INTERP, io);
+ const INTVAL k_type = VTABLE_shift_integer(INTERP, io);
+ const INTVAL v_type = VTABLE_shift_integer(INTERP, io);
Hash *hash;
UNUSED(k_type);
View
2  src/pmc/orderedhash.pmc
@@ -609,7 +609,7 @@ preserve key/value order.
if (!key)
continue;
- io->vtable->push_string(interp, io, key);
+ VTABLE_push_string(interp, io, key);
(info->visit_pmc_now)(interp, (PMC *)b->value, info);
}
break;
View
12 src/pmc/pair.pmc
@@ -230,10 +230,10 @@ Used to unarchive the Pair.
IMAGE_IO * const io = info->image_io;
PMC **pos;
- io->vtable->push_integer(INTERP, io, PObj_key_is_string_TEST(SELF));
+ VTABLE_push_integer(INTERP, io, PObj_key_is_string_TEST(SELF));
if (PObj_key_is_string_TEST(SELF)) {
- io->vtable->push_string(INTERP, io, (STRING *)PMC_struct_val(SELF));
+ VTABLE_push_string(INTERP, io, (STRING *)PMC_struct_val(SELF));
}
else {
PMC ** const temp_pos = (PMC **)&PMC_struct_val(SELF);
@@ -252,10 +252,10 @@ Used to unarchive the Pair.
void freeze(visit_info *info) {
IMAGE_IO * const io = info->image_io;
SUPER(info);
- io->vtable->push_integer(INTERP, io, PObj_key_is_string_TEST(SELF));
+ VTABLE_push_integer(INTERP, io, PObj_key_is_string_TEST(SELF));
if (PObj_key_is_string_TEST(SELF))
- io->vtable->push_string(INTERP, io, (STRING *)PMC_struct_val(SELF));
+ VTABLE_push_string(INTERP, io, (STRING *)PMC_struct_val(SELF));
}
void thaw(visit_info *info) {
@@ -264,10 +264,10 @@ Used to unarchive the Pair.
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL) {
- const INTVAL flag = io->vtable->shift_integer(INTERP, io);
+ const INTVAL flag = VTABLE_shift_integer(INTERP, io);
if (flag) {
PObj_key_is_string_SET(SELF);
- PMC_struct_val(SELF) = io->vtable->shift_string(INTERP, io);
+ PMC_struct_val(SELF) = VTABLE_shift_string(INTERP, io);
}
}
}
View
4 src/pmc/parrotclass.pmc
@@ -388,7 +388,7 @@ Create the class from the thawed parents and attributes array.
/* 1) freeze class name */
pos = class_data + PCD_CLASS_NAME;
- io->vtable->push_string(INTERP, io,
+ VTABLE_push_string(INTERP, io,
VTABLE_get_string(INTERP, *pos));
}
@@ -414,7 +414,7 @@ Create the class from the thawed parents and attributes array.
PMC *real_class;
/* thaw class name */
- STRING *class_name = io->vtable->shift_string(INTERP, io);
+ STRING *class_name = VTABLE_shift_string(INTERP, io);
/* if class exists in this interpreter, check if the
* thawed class is the same, if not bail out, if yes
View
4 src/pmc/parrotobject.pmc
@@ -602,7 +602,7 @@ Used to unarchive the object.
void freeze(visit_info *info) {
IMAGE_IO *io = info->image_io;
- io->vtable->push_integer(INTERP, io, PMC_int_val(SELF));
+ VTABLE_push_integer(INTERP, io, PMC_int_val(SELF));
}
void thaw(visit_info *info) {
@@ -611,7 +611,7 @@ Used to unarchive the object.
SUPER(info);
}
else if (info->extra_flags == EXTRA_IS_NULL) {
- INTVAL n = io->vtable->shift_integer(INTERP, io);
+ INTVAL n = VTABLE_shift_integer(INTERP, io);
set_attrib_array_size(SELF, n);
}
}
View
12 src/pmc/resizablebooleanarray.pmc
@@ -348,12 +348,12 @@ Used to archive the string.
const INTVAL size = ROUND_BYTES(PMC_int_val(SELF));
STRING *s;
- io->vtable->push_integer(INTERP, io, PMC_int_val2(SELF));
- io->vtable->push_integer(INTERP, io, PMC_int_val(SELF));
+ VTABLE_push_integer(INTERP, io, PMC_int_val2(SELF));
+ VTABLE_push_integer(INTERP, io, PMC_int_val(SELF));
s = string_from_cstring(INTERP, PMC_data_typed(SELF, char *), size);
- io->vtable->push_string(INTERP, io, s);
+ VTABLE_push_string(INTERP, io, s);
}
/*
@@ -367,9 +367,9 @@ Used to unarchive the string.
*/
void thaw(visit_info *info) {
IMAGE_IO * const io = info->image_io;
- const INTVAL headPos = io->vtable->shift_integer(INTERP, io);
- const INTVAL tailPos = io->vtable->shift_integer(INTERP, io);
- STRING * const s = io->vtable->shift_string(INTERP, io);
+ const INTVAL headPos = VTABLE_shift_integer(INTERP, io);
+ const INTVAL tailPos = VTABLE_shift_integer(INTERP, io);
+ STRING * const s = VTABLE_shift_string(INTERP, io);
PMC_data(SELF) = mem_sys_allocate_zeroed(s->bufused);
mem_sys_memcopy(PMC_data(SELF), s->strstart, s->bufused);
View
4 src/pmc/string.pmc
@@ -809,7 +809,7 @@ Used to archive the string.
void freeze(visit_info *info) {
IMAGE_IO * const io = info->image_io;
SUPER(info);
- io->vtable->push_string(INTERP, io, VTABLE_get_string(INTERP, SELF));
+ VTABLE_push_string(INTERP, io, VTABLE_get_string(INTERP, SELF));
}
/*
@@ -825,7 +825,7 @@ Used to unarchive the string.
IMAGE_IO * const io = info->image_io;
SUPER(info);
if (info->extra_flags == EXTRA_IS_NULL)
- DYNSELF.set_string_native(io->vtable->shift_string(INTERP, io));
+ DYNSELF.set_string_native(VTABLE_shift_string(INTERP, io));
}
/*
View
32 src/pmc/sub.pmc
@@ -475,20 +475,20 @@ Archives the subroutine.
* - vtable_index
*/
- io->vtable->push_integer(INTERP, io, (INTVAL) sub->start_offs);
- io->vtable->push_integer(INTERP, io, (INTVAL) sub->end_offs);
- io->vtable->push_integer(INTERP, io,
+ VTABLE_push_integer(INTERP, io, (INTVAL) sub->start_offs);
+ VTABLE_push_integer(INTERP, io, (INTVAL) sub->end_offs);
+ VTABLE_push_integer(INTERP, io,
PObj_get_FLAGS(pmc) & SUB_FLAG_PF_MASK);
- io->vtable->push_string(INTERP, io, sub->name);
- io->vtable->push_string(INTERP, io,
+ VTABLE_push_string(INTERP, io, sub->name);
+ VTABLE_push_string(INTERP, io,
Parrot_get_HLL_name(INTERP, sub->HLL_id));
- io->vtable->push_integer(INTERP, io, sub->comp_flags);
- io->vtable->push_integer(INTERP, io, sub->vtable_index);
+ VTABLE_push_integer(INTERP, io, sub->comp_flags);
+ VTABLE_push_integer(INTERP, io, sub->vtable_index);
for (i = 0; i < 4; ++i)
- io->vtable->push_integer(INTERP, io, sub->n_regs_used[i]);
+ VTABLE_push_integer(INTERP, io, sub->n_regs_used[i]);
}
/*
@@ -511,20 +511,20 @@ Unarchives the subroutine.
int i;
/* we get relative offsets */
- sub->start_offs = (size_t) io->vtable->shift_integer(INTERP, io);
- sub->end_offs = (size_t) io->vtable->shift_integer(INTERP, io);
- flags = io->vtable->shift_integer(INTERP, io);
+ sub->start_offs = (size_t) VTABLE_shift_integer(INTERP, io);
+ sub->end_offs = (size_t) VTABLE_shift_integer(INTERP, io);
+ flags = VTABLE_shift_integer(INTERP, io);
PObj_get_FLAGS(SELF) |= flags & SUB_FLAG_PF_MASK;
- sub->name = io->vtable->shift_string(INTERP, io);
+ sub->name = VTABLE_shift_string(INTERP, io);
sub->HLL_id = Parrot_get_HLL_id(INTERP,
- io->vtable->shift_string(INTERP, io));
- sub->comp_flags = io->vtable->shift_integer(INTERP, io);
- sub->vtable_index = io->vtable->shift_integer(INTERP, io);
+ VTABLE_shift_string(INTERP, io));
+ sub->comp_flags = VTABLE_shift_integer(INTERP, io);
+ sub->vtable_index = VTABLE_shift_integer(INTERP, io);
for (i = 0; i < 4; ++i)
- sub->n_regs_used[i] = io->vtable->shift_integer(INTERP, io);
+ sub->n_regs_used[i] = VTABLE_shift_integer(INTERP, io);
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.