Author: cotto
Date: Sat Jan 10 02:50:26 2009
New Revision: 35336
Modified:
trunk/include/parrot/exceptions.h
trunk/src/inter_call.c
trunk/src/multidispatch.c
trunk/src/oo.c
trunk/src/ops/object.ops
trunk/src/ops/pmc.ops
trunk/src/pmc/class.pmc
trunk/src/pmc/resizablepmcarray.pmc
trunk/t/dynpmc/rotest.t
trunk/t/oo/composition.t
Log:
[cage] change METH to METHOD in a few places
Modified: trunk/include/parrot/exceptions.h
==============================================================================
--- trunk/include/parrot/exceptions.h (original)
+++ trunk/include/parrot/exceptions.h Sat Jan 10 02:50:26 2009
@@ -70,14 +70,14 @@
EXCEPTION_ATTRIB_NOT_FOUND,
EXCEPTION_GLOBAL_NOT_FOUND,
EXCEPTION_EXTERNAL_ERROR,
- EXCEPTION_METH_NOT_FOUND,
+ EXCEPTION_METHOD_NOT_FOUND,
EXCEPTION_VTABLE_NOT_FOUND,
EXCEPTION_WRITE_TO_CONSTCLASS,
EXCEPTION_NOSPAWN,
EXCEPTION_INTERNAL_NOT_IMPLEMENTED,
EXCEPTION_ERR_OVERFLOW,
EXCEPTION_LOSSY_CONVERSION,
- EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT,
+ EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT,
EXCEPTION_UNEXPECTED_NULL,
EXCEPTION_LIBRARY_ERROR,
EXCEPTION_LIBRARY_NOT_LOADED,
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Sat Jan 10 02:50:26 2009
@@ -2703,7 +2703,7 @@
pccinvoke_meth = VTABLE_find_method(interp, pmc,
method_name);
if (PMC_IS_NULL(pccinvoke_meth))
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METH_NOT_FOUND,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found", method_name);
else
VTABLE_invoke(interp, pccinvoke_meth, NULL);
Modified: trunk/src/multidispatch.c
==============================================================================
--- trunk/src/multidispatch.c (original)
+++ trunk/src/multidispatch.c Sat Jan 10 02:50:26 2009
@@ -431,7 +431,7 @@
}
if (PMC_IS_NULL(sub))
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METH_NOT_FOUND,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METHOD_NOT_FOUND,
"Multiple Dispatch: No suitable candidate found for '%s',"
" with signature '%s'", name, sig);
Modified: trunk/src/oo.c
==============================================================================
--- trunk/src/oo.c (original)
+++ trunk/src/oo.c Sat Jan 10 02:50:26 2009
@@ -1161,7 +1161,7 @@
"->P", &immediate_parents);
if (!immediate_parents)
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METH_NOT_FOUND,
+ Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METHOD_NOT_FOUND,
"Failed to get parents list from class!");
parent_count = VTABLE_elements(interp, immediate_parents);
@@ -1284,7 +1284,7 @@
if (VTABLE_exists_keyed_str(interp, methods_hash, method_name))
/* Conflicts with something already in the class. */
Parrot_ex_throw_from_c_args(interp, NULL,
- EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT,
+ EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT,
"A conflict occurred during role composition "
"due to method '%S'.", method_name);
@@ -1293,7 +1293,7 @@
method_name))
/* Something very weird is going on. */
Parrot_ex_throw_from_c_args(interp, NULL,
- EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT,
+ EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT,
"A conflict occurred during role composition;"
" the method '%S' from the role managed to conflict "
"with itself somehow.", method_name);
@@ -1315,7 +1315,7 @@
if (VTABLE_exists_keyed_str(interp, methods_hash, alias_name))
/* Conflicts with something already in the class. */
Parrot_ex_throw_from_c_args(interp, NULL,
- EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT,
+ EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT,
"A conflict occurred during role composition"
" due to the aliasing of '%S' to '%S'.",
method_name, alias_name);
@@ -1324,7 +1324,7 @@
if (VTABLE_exists_keyed_str(interp, proposed_add_methods,
alias_name))
Parrot_ex_throw_from_c_args(interp, NULL,
- EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT,
+ EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT,
"A conflict occurred during role composition"
" due to the aliasing of '%S' to '%S' (role already has"
" a method '%S').", method_name, alias_name, alias_name);
Modified: trunk/src/ops/object.ops
==============================================================================
--- trunk/src/ops/object.ops (original)
+++ trunk/src/ops/object.ops Sat Jan 10 02:50:26 2009
@@ -65,12 +65,12 @@
PMC * const _class = VTABLE_get_class(interp, object);
if (PMC_IS_NULL(_class)) {
dest = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_METH_NOT_FOUND,
+ EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found for non-object", meth);
}
else {
dest = Parrot_ex_throw_from_op_args(interp, next,
- EXCEPTION_METH_NOT_FOUND,
+ EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found for invocant of class '%Ss'", meth,
VTABLE_get_string(interp, _class));
}
@@ -107,7 +107,7 @@
if (PMC_IS_NULL(method_pmc)) {
- dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METH_NOT_FOUND,
+ dest = Parrot_ex_throw_from_op_args(interp, next,
EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found for invocant of class '%Ss'", meth,
VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
}
@@ -141,7 +141,7 @@
opcode_t *dest;
if (PMC_IS_NULL(method_pmc)) {
- dest = Parrot_ex_throw_from_op_args(interp, next, EXCEPTION_METH_NOT_FOUND,
+ dest = Parrot_ex_throw_from_op_args(interp, next,
EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found for invocant of class '%Ss'", meth,
VTABLE_get_string(interp, VTABLE_get_class(interp, object)));
}
Modified: trunk/src/ops/pmc.ops
==============================================================================
--- trunk/src/ops/pmc.ops (original)
+++ trunk/src/ops/pmc.ops Sat Jan 10 02:50:26 2009
@@ -182,7 +182,7 @@
$1 = VTABLE_find_method(interp, $2, $3);
if (PMC_IS_NULL($1) || !VTABLE_defined(interp, $1)) {
opcode_t *dest = Parrot_ex_throw_from_op_args(interp, resume,
- EXCEPTION_METH_NOT_FOUND,
+ EXCEPTION_METHOD_NOT_FOUND,
"Method '%Ss' not found for invocant of class '%Ss'", $3,
VTABLE_get_string(interp, VTABLE_get_class(interp, $2)));
goto ADDRESS(dest);
Modified: trunk/src/pmc/class.pmc
==============================================================================
--- trunk/src/pmc/class.pmc (original)
+++ trunk/src/pmc/class.pmc Sat Jan 10 02:50:26 2009
@@ -732,7 +732,7 @@
/* Check that the name is actually valid as a vtable override */
if (Parrot_get_vtable_index(interp, name) == -1)
- Parrot_ex_throw_from_c_args(interp, NULL, EXCEPTION_METH_NOT_FOUND,
+ Parrot_ex_throw_from_c_args(interp, NULL,
EXCEPTION_METHOD_NOT_FOUND,
"'%S' is not a valid vtable function name.", name);
/* Add it to vtable methods list. */
@@ -1083,7 +1083,7 @@
VTABLE_get_string_keyed_int(interp,
_class->resolve_method, i);
if (!VTABLE_exists_keyed_str(interp, _class->methods,
check_meth))
Parrot_ex_throw_from_c_args(interp, NULL,
- EXCEPTION_METH_NOT_FOUND, "The method '%S' was named "
+ EXCEPTION_METHOD_NOT_FOUND, "The method '%S' was named
"
"in the resolve list, but not supplied", check_meth);
}
Modified: trunk/src/pmc/resizablepmcarray.pmc
==============================================================================
--- trunk/src/pmc/resizablepmcarray.pmc (original)
+++ trunk/src/pmc/resizablepmcarray.pmc Sat Jan 10 02:50:26 2009
@@ -1,5 +1,5 @@
/*
-Copyright (C) 2001-2008, The Perl Foundation.
+Copyright (C) 2001-2009, The Perl Foundation.
$Id$
=head1 NAME
Modified: trunk/t/dynpmc/rotest.t
==============================================================================
--- trunk/t/dynpmc/rotest.t (original)
+++ trunk/t/dynpmc/rotest.t Sat Jan 10 02:50:26 2009
@@ -65,7 +65,7 @@
.local pmc value, eh
value = new 'ROTest'
eh = new 'ExceptionHandler'
- eh.'handle_types'(.EXCEPTION_WRITE_TO_CONSTCLASS,
.EXCEPTION_METH_NOT_FOUND)
+ eh.'handle_types'(.EXCEPTION_WRITE_TO_CONSTCLASS,
.EXCEPTION_METHOD_NOT_FOUND)
set_addr eh, eh_label
#READONLYTEST
Modified: trunk/t/oo/composition.t
==============================================================================
--- trunk/t/oo/composition.t (original)
+++ trunk/t/oo/composition.t Sat Jan 10 02:50:26 2009
@@ -140,7 +140,7 @@
try:
eh = new 'ExceptionHandler'
- eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT)
+ eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT)
set_addr eh, catch
push_eh eh
@@ -170,7 +170,7 @@
try:
eh = new 'ExceptionHandler'
- eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT)
+ eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT)
set_addr eh, catch
push_eh eh
@@ -321,7 +321,7 @@
try:
eh = new 'ExceptionHandler'
- eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METH_CONFLICT)
+ eh.'handle_types'(.EXCEPTION_ROLE_COMPOSITION_METHOD_CONFLICT)
set_addr eh, catch
push_eh eh
