Author: fperrad
Date: Thu Apr 5 09:28:50 2007
New Revision: 18002
Modified:
trunk/languages/lua/pmc/luanumber.pmc
trunk/languages/lua/pmc/luastring.pmc
Log:
[Lua]
- use new rewrite in pmc2c
Modified: trunk/languages/lua/pmc/luanumber.pmc
==============================================================================
--- trunk/languages/lua/pmc/luanumber.pmc (original)
+++ trunk/languages/lua/pmc/luanumber.pmc Thu Apr 5 09:28:50 2007
@@ -283,7 +283,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_add_LuaNumber(INTERP, SELF, n, dest);
}
@@ -324,7 +324,7 @@
DYNSELF.get_number() + VTABLE_get_number(INTERP, value));
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_add_LuaNumber(INTERP, SELF, n);
}
@@ -366,7 +366,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_subtract_LuaNumber(INTERP, SELF,
n, dest);
@@ -408,7 +408,7 @@
DYNSELF.get_number() - VTABLE_get_number(INTERP, value));
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_subtract_LuaNumber(INTERP, SELF, n);
}
@@ -450,7 +450,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_multiply_LuaNumber(INTERP, SELF,
n, dest);
@@ -492,7 +492,7 @@
DYNSELF.get_number() * VTABLE_get_number(INTERP, value));
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_multiply_LuaNumber(INTERP, SELF, n);
}
@@ -534,7 +534,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_divide_LuaNumber(INTERP, SELF,
n, dest);
@@ -576,7 +576,7 @@
DYNSELF.get_number() / VTABLE_get_number(INTERP, value));
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_divide_LuaNumber(INTERP, SELF, n);
}
@@ -620,7 +620,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_modulus_LuaNumber(INTERP, SELF,
n, dest);
@@ -664,7 +664,7 @@
VTABLE_set_number_native(INTERP, SELF, a - floor(a/b)*b);
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_modulus_LuaNumber(INTERP, SELF, n);
}
@@ -706,7 +706,7 @@
return dest;
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
return Parrot_LuaNumber_pow_LuaNumber(INTERP, SELF, n, dest);
}
@@ -747,7 +747,7 @@
pow(DYNSELF.get_number(), VTABLE_get_number(INTERP, value)));
}
MMD_LuaString: {
- PMC* n = Parrot_LuaString_nci_tonumber(INTERP, value);
+ PMC* n = LuaString.value.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
Parrot_LuaNumber_i_pow_LuaNumber(INTERP, SELF, n);
}
Modified: trunk/languages/lua/pmc/luastring.pmc
==============================================================================
--- trunk/languages/lua/pmc/luastring.pmc (original)
+++ trunk/languages/lua/pmc/luastring.pmc Thu Apr 5 09:28:50 2007
@@ -206,7 +206,7 @@
PMC* neg (PMC * dest) {
PMC* n = SELF.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
- return Parrot_LuaNumber_neg(INTERP, n, dest);
+ return LuaNumber.n.neg(dest);
}
else {
real_exception(INTERP, NULL, ILL_INHERIT,
@@ -226,7 +226,7 @@
void i_neg() {
PMC* n = SELF.tonumber();
if (n->vtable->base_type == dynpmc_LuaNumber) {
- Parrot_LuaNumber_i_neg(INTERP, n);
+ LuaNumber.n.i_neg();
}
else {
real_exception(INTERP, NULL, ILL_INHERIT,
