lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [2/3] git commit: refs/heads/master - Finish renaming of lucy_method_t to cfish_method_t
Date Sat, 18 May 2013 11:08:46 GMT
Finish renaming of lucy_method_t to cfish_method_t


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/5ca26ba9
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/5ca26ba9
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/5ca26ba9

Branch: refs/heads/master
Commit: 5ca26ba9f428986626f00e1f9ed1b064a8d32779
Parents: 89d2c8e
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat May 18 00:03:19 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sat May 18 13:02:26 2013 +0200

----------------------------------------------------------------------
 clownfish/compiler/src/CFCBindAliases.c |    4 ----
 core/Clownfish/Method.c                 |    4 ++--
 core/Clownfish/Method.cfh               |   10 +++++-----
 core/Clownfish/VTable.c                 |    4 ++--
 core/Clownfish/VTable.cfh               |    4 ++--
 5 files changed, 11 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/5ca26ba9/clownfish/compiler/src/CFCBindAliases.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCBindAliases.c b/clownfish/compiler/src/CFCBindAliases.c
index 8464c95..09a1c84 100644
--- a/clownfish/compiler/src/CFCBindAliases.c
+++ b/clownfish/compiler/src/CFCBindAliases.c
@@ -24,10 +24,6 @@ struct alias {
 };
 
 struct alias aliases[] = {
-    {"cfish_method_t", "lucy_method_t"},
-    {"cfish_method", "lucy_method"},
-    {"cfish_super_method", "lucy_super_method"},
-
     {"cfish_Obj", "lucy_Obj"},
     {"CFISH_OBJ", "LUCY_OBJ"},
     {"Cfish_Obj_Dump", "Lucy_Obj_Dump"},

http://git-wip-us.apache.org/repos/asf/lucy/blob/5ca26ba9/core/Clownfish/Method.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/Method.c b/core/Clownfish/Method.c
index 13f3abb..8a76d2b 100644
--- a/core/Clownfish/Method.c
+++ b/core/Clownfish/Method.c
@@ -24,13 +24,13 @@
 #include "Clownfish/VTable.h"
 
 Method*
-Method_new(const CharBuf *name, lucy_method_t callback_func, size_t offset) {
+Method_new(const CharBuf *name, cfish_method_t callback_func, size_t offset) {
     Method *self = (Method*)VTable_Make_Obj(METHOD);
     return Method_init(self, name, callback_func, offset);
 }
 
 Method*
-Method_init(Method *self, const CharBuf *name, lucy_method_t callback_func,
+Method_init(Method *self, const CharBuf *name, cfish_method_t callback_func,
             size_t offset) {
     self->name          = CB_Clone(name);
     self->callback_func = callback_func;

http://git-wip-us.apache.org/repos/asf/lucy/blob/5ca26ba9/core/Clownfish/Method.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Method.cfh b/core/Clownfish/Method.cfh
index b2476ec..17df64a 100644
--- a/core/Clownfish/Method.cfh
+++ b/core/Clownfish/Method.cfh
@@ -21,15 +21,15 @@ parcel Lucy;
 
 class Clownfish::Method inherits Clownfish::Obj {
 
-    CharBuf       *name;
-    lucy_method_t  callback_func;
-    size_t         offset;
+    CharBuf        *name;
+    cfish_method_t  callback_func;
+    size_t          offset;
 
     inert Method*
-    new(const CharBuf *name, lucy_method_t callback_func, size_t offset);
+    new(const CharBuf *name, cfish_method_t callback_func, size_t offset);
 
     inert Method*
-    init(Method *self, const CharBuf *name, lucy_method_t callback_func,
+    init(Method *self, const CharBuf *name, cfish_method_t callback_func,
          size_t offset);
 
     incremented Obj*

http://git-wip-us.apache.org/repos/asf/lucy/blob/5ca26ba9/core/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.c b/core/Clownfish/VTable.c
index e2bbad1..7abdb8e 100644
--- a/core/Clownfish/VTable.c
+++ b/core/Clownfish/VTable.c
@@ -166,8 +166,8 @@ VTable_get_refcount(VTable *self) {
 }
 
 void
-VTable_override(VTable *self, lucy_method_t method, size_t offset) {
-    union { char *char_ptr; lucy_method_t *func_ptr; } pointer;
+VTable_override(VTable *self, cfish_method_t method, size_t offset) {
+    union { char *char_ptr; cfish_method_t *func_ptr; } pointer;
     pointer.char_ptr = ((char*)self) + offset;
     pointer.func_ptr[0] = method;
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/5ca26ba9/core/Clownfish/VTable.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.cfh b/core/Clownfish/VTable.cfh
index 0351082..9f2555d 100644
--- a/core/Clownfish/VTable.cfh
+++ b/core/Clownfish/VTable.cfh
@@ -31,7 +31,7 @@ class Clownfish::VTable inherits Clownfish::Obj {
     size_t             obj_alloc_size;
     size_t             vt_alloc_size;
     VArray            *methods;
-    lucy_method_t[1]   method_ptrs; /* flexible array */
+    cfish_method_t[1]  method_ptrs; /* flexible array */
 
     inert LockFreeRegistry *registry;
     inert size_t offset_of_parent;
@@ -92,7 +92,7 @@ class Clownfish::VTable inherits Clownfish::Obj {
     /** Replace a function pointer in the VTable.
      */
     void
-    Override(VTable *self, lucy_method_t method_ptr, size_t offset);
+    Override(VTable *self, cfish_method_t method_ptr, size_t offset);
 
     /** Create an empty object of the type defined by the VTable: allocate,
      * assign its vtable and give it an initial refcount of 1.  The caller is


Mime
View raw message