[svn:parrot] r38573 - in trunk/src: . pmc
chromatic at svn.parrot.org
chromatic at svn.parrot.org
Fri May 8 01:24:13 UTC 2009
Author: chromatic
Date: Fri May 8 01:24:12 2009
New Revision: 38573
URL: https://trac.parrot.org/parrot/changeset/38573
Log:
[PMC] Replaced all uses of key_integer() outside of Key PMC and src/key.c with
get_integer VTABLE calls. This allows key_integer() to skip the "Is this
really a Key?" check.
Modified:
trunk/src/key.c
trunk/src/pmc/array.pmc
trunk/src/pmc/fixedbooleanarray.pmc
trunk/src/pmc/fixedfloatarray.pmc
trunk/src/pmc/fixedintegerarray.pmc
trunk/src/pmc/fixedpmcarray.pmc
trunk/src/pmc/fixedstringarray.pmc
trunk/src/pmc/iterator.pmc
trunk/src/pmc/orderedhash.pmc
trunk/src/pmc/parrotinterpreter.pmc
trunk/src/pmc/resizablepmcarray.pmc
trunk/src/pmc/resizablestringarray.pmc
trunk/src/pmc/string.pmc
trunk/src/pmc/unmanagedstruct.pmc
Modified: trunk/src/key.c
==============================================================================
--- trunk/src/key.c Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/key.c Fri May 8 01:24:12 2009 (r38573)
@@ -331,8 +331,7 @@
STRING *str_key;
FLOATVAL num_key;
- if (VTABLE_isa(interp, key, CONST_STRING(interp, "Key"))) {
- switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
+ switch (PObj_get_FLAGS(key) & KEY_type_FLAGS) {
case KEY_hash_iterator_FLAGS:
case KEY_integer_FLAG:
@@ -378,7 +377,6 @@
case KEY_inf_slice_FLAG:
default:
break;
- }
}
return VTABLE_get_integer(interp, key);
Modified: trunk/src/pmc/array.pmc
==============================================================================
--- trunk/src/pmc/array.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/array.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -338,7 +338,7 @@
if (!key)
return 0;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -386,7 +386,7 @@
if (!key)
return (FLOATVAL)0;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -433,7 +433,7 @@
if (!key)
return 0;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -480,7 +480,7 @@
if (!key)
return 0;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -556,7 +556,7 @@
if (!key)
return;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey) {
@@ -607,7 +607,7 @@
if (!key)
return;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey) {
@@ -658,7 +658,7 @@
if (!key)
return;
- ix = key_integer(INTERP, key);
+ ix = VTABLE_get_integer(INTERP, key);
nextkey = key_next(INTERP, key);
if (!nextkey) {
@@ -709,7 +709,7 @@
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
PMC *box;
- const INTVAL ix = key_integer(INTERP, key);
+ const INTVAL ix = VTABLE_get_integer(INTERP, key);
PMC * const nextkey = key_next(INTERP, key);
if (!nextkey) {
@@ -1040,7 +1040,7 @@
VTABLE INTVAL defined_keyed(PMC *key) {
PMC *box;
- const INTVAL ix = key_integer(INTERP, key);
+ const INTVAL ix = VTABLE_get_integer(INTERP, key);
PMC * const nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -1087,7 +1087,7 @@
VTABLE INTVAL exists_keyed(PMC *key) {
PMC *box;
- const INTVAL ix = key_integer(INTERP, key);
+ const INTVAL ix = VTABLE_get_integer(INTERP, key);
PMC * const nextkey = key_next(INTERP, key);
if (!nextkey)
@@ -1126,7 +1126,7 @@
*/
VTABLE void delete_keyed(PMC *key) {
- const INTVAL ix = key_integer(INTERP, key);
+ const INTVAL ix = VTABLE_get_integer(INTERP, key);
list_splice(INTERP, (List *)PMC_data(pmc), NULL, ix, 1);
}
Modified: trunk/src/pmc/fixedbooleanarray.pmc
==============================================================================
--- trunk/src/pmc/fixedbooleanarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/fixedbooleanarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -185,7 +185,7 @@
VTABLE INTVAL get_integer_keyed(PMC *key) {
/* simple int keys only */
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_integer_keyed_int(k);
}
@@ -216,7 +216,7 @@
*/
VTABLE FLOATVAL get_number_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_number_keyed_int(k);
}
@@ -276,7 +276,7 @@
*/
VTABLE STRING *get_string_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_string_keyed_int(k);
}
@@ -309,7 +309,7 @@
*/
VTABLE PMC *get_pmc_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_pmc_keyed_int(k);
}
@@ -377,7 +377,7 @@
*/
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_integer_keyed_int(k, value);
}
@@ -408,7 +408,7 @@
*/
VTABLE void set_number_keyed(PMC *key, FLOATVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_number_keyed_int(k, value);
}
@@ -444,7 +444,7 @@
*/
VTABLE void set_string_keyed(PMC *key, STRING *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_string_keyed_int(k, value);
}
@@ -475,7 +475,7 @@
*/
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_pmc_keyed_int(k, value);
}
Modified: trunk/src/pmc/fixedfloatarray.pmc
==============================================================================
--- trunk/src/pmc/fixedfloatarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/fixedfloatarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -195,7 +195,7 @@
VTABLE INTVAL get_integer_keyed(PMC *key) {
/* simple int keys only */
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_integer_keyed_int(k);
}
@@ -234,7 +234,7 @@
*/
VTABLE FLOATVAL get_number_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_number_keyed_int(k);
}
@@ -264,7 +264,7 @@
*/
VTABLE STRING *get_string_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_string_keyed_int(k);
}
@@ -298,7 +298,7 @@
*/
VTABLE PMC *get_pmc_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_pmc_keyed_int(k);
}
@@ -350,7 +350,7 @@
*/
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_integer_keyed_int(k, value);
}
@@ -390,7 +390,7 @@
*/
VTABLE void set_number_keyed(PMC *key, FLOATVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_number_keyed_int(k, value);
}
@@ -425,7 +425,7 @@
*/
VTABLE void set_string_keyed(PMC *key, STRING *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_string_keyed_int(k, value);
}
@@ -456,7 +456,7 @@
*/
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_pmc_keyed_int(k, value);
}
Modified: trunk/src/pmc/fixedintegerarray.pmc
==============================================================================
--- trunk/src/pmc/fixedintegerarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/fixedintegerarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -286,7 +286,7 @@
VTABLE INTVAL get_integer_keyed(PMC *key) {
/* simple int keys only */
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_integer_keyed_int(k);
}
@@ -317,7 +317,7 @@
*/
VTABLE FLOATVAL get_number_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_number_keyed_int(k);
}
@@ -377,7 +377,7 @@
*/
VTABLE STRING *get_string_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_string_keyed_int(k);
}
@@ -410,7 +410,7 @@
*/
VTABLE PMC *get_pmc_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_pmc_keyed_int(k);
}
@@ -476,7 +476,7 @@
*/
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_integer_keyed_int(k, value);
}
@@ -505,7 +505,7 @@
*/
VTABLE void set_number_keyed(PMC *key, FLOATVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_number_keyed_int(k, value);
}
@@ -539,7 +539,7 @@
*/
VTABLE void set_string_keyed(PMC *key, STRING *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_string_keyed_int(k, value);
}
@@ -569,7 +569,7 @@
*/
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_pmc_keyed_int(k, value);
}
Modified: trunk/src/pmc/fixedpmcarray.pmc
==============================================================================
--- trunk/src/pmc/fixedpmcarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/fixedpmcarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -338,7 +338,7 @@
*/
VTABLE PMC *get_pmc_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
PMC * const nextkey = key_next(INTERP, key);
PMC *box;
@@ -474,7 +474,7 @@
*/
VTABLE void set_number_keyed(PMC *key, FLOATVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
PMC * const nextkey = key_next(INTERP, key);
if (nextkey == NULL) {
@@ -563,7 +563,7 @@
*/
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
PMC *nextkey = key_next(INTERP, key);
if (!nextkey) {
@@ -685,7 +685,7 @@
}
VTABLE INTVAL exists_keyed(PMC *key) {
- const INTVAL ix = key_integer(INTERP, key);
+ const INTVAL ix = VTABLE_get_integer(INTERP, key);
return SELF.exists_keyed_int(ix);
}
Modified: trunk/src/pmc/fixedstringarray.pmc
==============================================================================
--- trunk/src/pmc/fixedstringarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/fixedstringarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -231,7 +231,7 @@
VTABLE INTVAL get_integer_keyed(PMC *key) {
/* simple int keys only */
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_integer_keyed_int(k);
}
@@ -262,7 +262,7 @@
*/
VTABLE FLOATVAL get_number_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_number_keyed_int(k);
}
@@ -301,7 +301,7 @@
*/
VTABLE STRING *get_string_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_string_keyed_int(k);
}
@@ -335,7 +335,7 @@
*/
VTABLE PMC *get_pmc_keyed(PMC *key) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return SELF.get_pmc_keyed_int(k);
}
@@ -397,7 +397,7 @@
*/
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_integer_keyed_int(k, value);
}
@@ -433,7 +433,7 @@
*/
VTABLE void set_number_keyed(PMC *key, FLOATVAL value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_number_keyed_int(k, value);
}
@@ -471,7 +471,7 @@
*/
VTABLE void set_string_keyed(PMC *key, STRING *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_string_keyed_int(k, value);
}
@@ -502,7 +502,7 @@
*/
VTABLE void set_pmc_keyed(PMC *key, PMC *value) {
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
SELF.set_pmc_keyed_int(k, value);
}
Modified: trunk/src/pmc/iterator.pmc
==============================================================================
--- trunk/src/pmc/iterator.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/iterator.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -202,7 +202,7 @@
VTABLE STRING *get_string() {
PMC *key;
GET_ATTR_key(INTERP, SELF, key);
- return Parrot_str_from_int(INTERP, key_integer(INTERP, key));
+ return Parrot_str_from_int(INTERP, VTABLE_get_integer(INTERP, key));
}
/*
Modified: trunk/src/pmc/orderedhash.pmc
==============================================================================
--- trunk/src/pmc/orderedhash.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/orderedhash.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -112,7 +112,7 @@
VTABLE PMC *get_pmc_keyed(PMC *key) {
if ((PObj_get_FLAGS(key) & KEY_type_FLAGS) == KEY_integer_FLAG) {
- PMC * const item = SELF.get_pmc_keyed_int(key_integer(INTERP, key));
+ PMC * const item = SELF.get_pmc_keyed_int(VTABLE_get_integer(INTERP, key));
PMC * const next = key_next(INTERP, key);
if (!next)
@@ -160,7 +160,7 @@
VTABLE STRING *get_string_keyed(PMC *key) {
if ((PObj_get_FLAGS(key) & KEY_type_FLAGS) == KEY_integer_FLAG) {
- PMC * const item = SELF.get_pmc_keyed_int(key_integer(INTERP, key));
+ PMC * const item = SELF.get_pmc_keyed_int(VTABLE_get_integer(INTERP, key));
PMC * const next = key_next(INTERP, key);
if (!next)
@@ -209,7 +209,7 @@
VTABLE INTVAL get_integer_keyed(PMC *key) {
if ((PObj_get_FLAGS(key) & KEY_type_FLAGS) == KEY_integer_FLAG) {
- PMC * const item = SELF.get_pmc_keyed_int(key_integer(INTERP, key));
+ PMC * const item = SELF.get_pmc_keyed_int(VTABLE_get_integer(INTERP, key));
PMC * const next = key_next(INTERP, key);
if (!next)
@@ -258,7 +258,7 @@
VTABLE FLOATVAL get_number_keyed(PMC *key) {
if ((PObj_get_FLAGS(key) & KEY_type_FLAGS) == KEY_integer_FLAG) {
- PMC * const item = SELF.get_pmc_keyed_int(key_integer(INTERP, key));
+ PMC * const item = SELF.get_pmc_keyed_int(VTABLE_get_integer(INTERP, key));
PMC * const next = key_next(INTERP, key);
if (!next)
@@ -402,7 +402,7 @@
PMC *item, *next;
HashBucket *b;
Hash * const h = (Hash *)SELF.get_pointer();
- INTVAL idx = key_integer(INTERP, key);
+ INTVAL idx = VTABLE_get_integer(INTERP, key);
const INTVAL n = h->entries;
if (idx < 0)
@@ -450,7 +450,7 @@
VTABLE INTVAL defined_keyed(PMC *key) {
if (PObj_get_FLAGS(key) & KEY_integer_FLAG) {
Hash * const h = (Hash *)SELF.get_pointer();
- INTVAL idx = key_integer(INTERP, key);
+ INTVAL idx = VTABLE_get_integer(INTERP, key);
const INTVAL n = h->entries;
HashBucket *b;
@@ -518,12 +518,12 @@
if (PObj_get_FLAGS(key) & KEY_integer_FLAG) {
if (next) {
- PMC * const item = SELF.get_pmc_keyed_int(key_integer(INTERP, key));
+ PMC * const item = SELF.get_pmc_keyed_int(VTABLE_get_integer(INTERP, key));
VTABLE_delete_keyed(INTERP, item, next);
return;
}
- SELF.delete_keyed_int(key_integer(INTERP, key));
+ SELF.delete_keyed_int(VTABLE_get_integer(INTERP, key));
}
else {
if (next) {
Modified: trunk/src/pmc/parrotinterpreter.pmc
==============================================================================
--- trunk/src/pmc/parrotinterpreter.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/parrotinterpreter.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -444,7 +444,7 @@
nextkey = key_next(INTERP, key);
if (nextkey)
- level = key_integer(interp, nextkey);
+ level = VTABLE_get_integer(interp, nextkey);
else if (outer)
level = 1;
Modified: trunk/src/pmc/resizablepmcarray.pmc
==============================================================================
--- trunk/src/pmc/resizablepmcarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/resizablepmcarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -278,7 +278,7 @@
}
VTABLE void delete_keyed(PMC *key) {
- const INTVAL idx = key_integer(INTERP, key);
+ const INTVAL idx = VTABLE_get_integer(INTERP, key);
SELF.delete_keyed_int(idx);
}
@@ -318,7 +318,7 @@
}
VTABLE INTVAL exists_keyed(PMC *key) {
- INTVAL ix = key_integer(INTERP, key);
+ INTVAL ix = VTABLE_get_integer(INTERP, key);
return SELF.exists_keyed_int(ix);
}
Modified: trunk/src/pmc/resizablestringarray.pmc
==============================================================================
--- trunk/src/pmc/resizablestringarray.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/resizablestringarray.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -563,7 +563,7 @@
*/
VTABLE void delete_keyed(PMC *key) {
- INTVAL idx = key_integer(INTERP, key);
+ INTVAL idx = VTABLE_get_integer(INTERP, key);
STRING **str_array;
UINTVAL size, i;
Modified: trunk/src/pmc/string.pmc
==============================================================================
--- trunk/src/pmc/string.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/string.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2003-2008, Parrot Foundation.
+Copyright (C) 2003-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -646,26 +646,26 @@
VTABLE STRING *get_string_keyed(PMC *key) {
STRING * const s = SELF.get_string();
- const INTVAL k = key_integer(INTERP, key);
+ const INTVAL k = VTABLE_get_integer(INTERP, key);
return Parrot_str_substr(INTERP, s, k, 1, NULL, 0);
}
VTABLE INTVAL get_integer_keyed(PMC *key) {
STRING * const s = SELF.get_string();
- return string_ord(INTERP, s, key_integer(INTERP, key));
+ return string_ord(INTERP, s, VTABLE_get_integer(INTERP, key));
}
VTABLE void set_string_keyed(PMC *key, STRING * const value) {
STRING * const s = SELF.get_string();
const INTVAL len = Parrot_str_byte_length(INTERP, value);
- Parrot_str_replace(INTERP, s, key_integer(INTERP, key), len, value, NULL);
+ Parrot_str_replace(INTERP, s, VTABLE_get_integer(INTERP, key), len, value, NULL);
VTABLE_set_string_native(INTERP, SELF, s);
}
VTABLE void set_integer_keyed(PMC *key, INTVAL value) {
STRING * const s = SELF.get_string();
STRING * const c = string_chr(INTERP, (UINTVAL) value);
- Parrot_str_replace(INTERP, s, key_integer(INTERP, key), 1, c, NULL);
+ Parrot_str_replace(INTERP, s, VTABLE_get_integer(INTERP, key), 1, c, NULL);
VTABLE_set_string_native(INTERP, SELF, s);
}
/*
Modified: trunk/src/pmc/unmanagedstruct.pmc
==============================================================================
--- trunk/src/pmc/unmanagedstruct.pmc Fri May 8 01:17:22 2009 (r38572)
+++ trunk/src/pmc/unmanagedstruct.pmc Fri May 8 01:24:12 2009 (r38573)
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, Parrot Foundation.
+Copyright (C) 2001-2009, Parrot Foundation.
$Id$
=head1 NAME
@@ -108,7 +108,7 @@
ix /= 3;
}
else
- ix = key_integer(interp, key);
+ ix = VTABLE_get_integer(interp, key);
return ix;
}
@@ -146,7 +146,7 @@
return p;
if (PObj_get_FLAGS(next) & KEY_integer_FLAG)
- count = key_integer(interp, next);
+ count = VTABLE_get_integer(interp, next);
else
count = 1;
More information about the parrot-commits
mailing list