[lucy-commits] svn commit: r1137837 - in /incubator/lucy/trunk/clownfish/src: CFCBindMethod.c CFCDumpable.c CFCMethod.c CFCMethod.h

[ma...@apache.org]

Author: marvin
Date: Tue Jun 21 01:32:54 2011
New Revision: 1137837

URL: http://svn.apache.org/viewvc?rev=1137837&view=rev
Log:
Remove remaining casts to CFCFunction*.

Modified:
    incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
    incubator/lucy/trunk/clownfish/src/CFCDumpable.c
    incubator/lucy/trunk/clownfish/src/CFCMethod.c
    incubator/lucy/trunk/clownfish/src/CFCMethod.h

Modified: incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCBindMethod.c?rev=1137837&r1=1137836&r2=1137837&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCBindMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCBindMethod.c Tue Jun 21 01:32:54 2011
@@ -44,8 +44,7 @@ char*
 CFCBindMeth_abstract_method_def(CFCMethod *method) {
     CFCParamList *param_list = CFCMethod_get_param_list(method);
     const char *params = CFCParamList_to_c(param_list);
-    const char *full_func_sym 
-        = CFCFunction_full_func_sym((CFCFunction*)method);
+    const char *full_func_sym = CFCMethod_implementing_func_sym(method);
     const char *vtable_var
         = CFCType_get_vtable_var(CFCMethod_self_type(method));
     CFCType    *return_type  = CFCMethod_get_return_type(method);

Modified: incubator/lucy/trunk/clownfish/src/CFCDumpable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCDumpable.c?rev=1137837&r1=1137836&r2=1137837&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCDumpable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCDumpable.c Tue Jun 21 01:32:54 2011
@@ -156,7 +156,7 @@ S_add_dump_method(CFCClass *klass) {
     CFCMethod *method = S_make_method_obj(klass, "Dump");
     CFCClass_add_method(klass, method);
     CFCBase_decref((CFCBase*)method);
-    const char *full_func_sym = CFCFunction_full_func_sym((CFCFunction*)method);
+    const char *full_func_sym = CFCMethod_implementing_func_sym(method);
     const char *full_typedef  = CFCMethod_full_typedef(method);
     const char *full_struct   = CFCClass_full_struct_sym(klass);
     const char *vtable_var    = CFCClass_full_vtable_var(klass);
@@ -224,7 +224,7 @@ S_add_load_method(CFCClass *klass) {
     CFCMethod *method = S_make_method_obj(klass, "Load");
     CFCClass_add_method(klass, method);
     CFCBase_decref((CFCBase*)method);
-    const char *full_func_sym = CFCFunction_full_func_sym((CFCFunction*)method);
+    const char *full_func_sym = CFCMethod_implementing_func_sym(method);
     const char *full_typedef  = CFCMethod_full_typedef(method);
     const char *full_struct   = CFCClass_full_struct_sym(klass);
     const char *vtable_var    = CFCClass_full_vtable_var(klass);

Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.c?rev=1137837&r1=1137836&r2=1137837&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.c Tue Jun 21 01:32:54 2011
@@ -130,7 +130,7 @@ CFCMethod_init(CFCMethod *self, CFCParce
     self->is_abstract   = is_abstract;
 
     // Derive more symbols.
-    const char *full_func_sym = CFCFunction_full_func_sym((CFCFunction*)self);
+    const char *full_func_sym = CFCMethod_implementing_func_sym(self);
     size_t amount = strlen(full_func_sym) + sizeof("_OVERRIDE") + 1;
     self->full_callback_sym = (char*)MALLOCATE(amount);
     self->full_override_sym = (char*)MALLOCATE(amount);
@@ -217,8 +217,8 @@ CFCMethod_override(CFCMethod *self, CFCM
               orig->macro_sym, orig_class, my_class);
     }
     if (!CFCMethod_compatible(self, orig)) {
-        const char *func      = CFCFunction_full_func_sym((CFCFunction*)self);
-        const char *orig_func = CFCFunction_full_func_sym((CFCFunction*)orig);
+        const char *func      = CFCMethod_implementing_func_sym(self);
+        const char *orig_func = CFCMethod_implementing_func_sym(orig);
         croak("Non-matching signatures for %s and %s", func, orig_func);
     }
 
@@ -396,3 +396,9 @@ CFCParamList*
 CFCMethod_get_param_list(CFCMethod *self) {
     return CFCFunction_get_param_list((CFCFunction*)self);
 }
+
+const char*
+CFCMethod_implementing_func_sym(CFCMethod *self) {
+    return CFCFunction_full_func_sym((CFCFunction*)self);
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.h?rev=1137837&r1=1137836&r2=1137837&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.h Tue Jun 21 01:32:54 2011
@@ -130,6 +130,9 @@ CFCMethod_get_return_type(CFCMethod *sel
 struct CFCParamList*
 CFCMethod_get_param_list(CFCMethod *self);
 
+const char*
+CFCMethod_implementing_func_sym(CFCMethod *self);
+
 #ifdef __cplusplus
 }
 #endif