You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by ma...@apache.org on 2011/06/24 18:36:12 UTC
[lucy-commits] svn commit: r1139379 - in /incubator/lucy/trunk/clownfish: lib/Clownfish.xs
src/CFCBindClass.c src/CFCBindClass.h
Author: marvin
Date: Fri Jun 24 16:36:11 2011
New Revision: 1139379
URL: http://svn.apache.org/viewvc?rev=1139379&view=rev
Log:
Reduce exposure of some symbols which had to be exposed during transition from
Perl to C.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish.xs
incubator/lucy/trunk/clownfish/src/CFCBindClass.c
incubator/lucy/trunk/clownfish/src/CFCBindClass.h
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish.xs
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish.xs?rev=1139379&r1=1139378&r2=1139379&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish.xs (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish.xs Fri Jun 24 16:36:11 2011
@@ -1782,22 +1782,10 @@ void
_set_or_get(self, ...)
CFCBindClass *self;
ALIAS:
- _full_callbacks_var = 2
- _full_name_var = 4
_short_names_macro = 6
PPCODE:
{
START_SET_OR_GET_SWITCH
- case 2: {
- const char *value = CFCBindClass_full_callbacks_var(self);
- retval = newSVpv(value, strlen(value));
- }
- break;
- case 4: {
- const char *value = CFCBindClass_full_name_var(self);
- retval = newSVpv(value, strlen(value));
- }
- break;
case 6: {
const char *value = CFCBindClass_short_names_macro(self);
retval = newSVpv(value, strlen(value));
@@ -1813,17 +1801,3 @@ CODE:
RETVAL = S_sv_eat_c_string(CFCBindClass_struct_definition(self));
OUTPUT: RETVAL
-SV*
-_name_var_definition(self)
- CFCBindClass *self;
-CODE:
- RETVAL = S_sv_eat_c_string(CFCBindClass_name_var_definition(self));
-OUTPUT: RETVAL
-
-SV*
-_vtable_definition(self)
- CFCBindClass *self;
-CODE:
- RETVAL = S_sv_eat_c_string(CFCBindClass_vtable_definition(self));
-OUTPUT: RETVAL
-
Modified: incubator/lucy/trunk/clownfish/src/CFCBindClass.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCBindClass.c?rev=1139379&r1=1139378&r2=1139379&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCBindClass.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCBindClass.c Fri Jun 24 16:36:11 2011
@@ -37,6 +37,16 @@ struct CFCBindClass {
char *short_names_macro;
};
+// Return C code defining the class's VTable.
+static char*
+S_vtable_definition(CFCBindClass *self);
+
+/* C code defining the ZombieCharBuf which contains the class name for this
+ * class.
+ */
+static char*
+S_name_var_definition(CFCBindClass *self);
+
CFCBindClass*
CFCBindClass_new(CFCClass *client) {
CFCBindClass *self
@@ -93,8 +103,8 @@ CFCBindClass_to_c(CFCBindClass *self) {
const char *autocode = CFCClass_get_autocode(client);
const char *vt_type = CFCClass_full_vtable_type(client);
const char *cnick = CFCClass_get_cnick(client);
- char *class_name_def = CFCBindClass_name_var_definition(self);
- char *vtable_def = CFCBindClass_vtable_definition(self);
+ char *class_name_def = S_name_var_definition(self);
+ char *vtable_def = S_vtable_definition(self);
CFCMethod **methods = CFCClass_methods(client);
CFCMethod **novel_methods = CFCClass_novel_methods(client);
@@ -223,10 +233,8 @@ CFCBindClass_struct_definition(CFCBindCl
return struct_def;
}
-/* C code defining the ZombieCharBuf which contains the class name for this
- * class. */
-char*
-CFCBindClass_name_var_definition(CFCBindClass *self) {
+static char*
+S_name_var_definition(CFCBindClass *self) {
const char *class_name = CFCClass_get_class_name(self->client);
unsigned class_name_len = (unsigned)strlen(class_name);
@@ -251,8 +259,8 @@ CFCBindClass_name_var_definition(CFCBind
}
// Return C code defining the class's VTable.
-char*
-CFCBindClass_vtable_definition(CFCBindClass *self) {
+static char*
+S_vtable_definition(CFCBindClass *self) {
CFCClass *client = self->client;
CFCClass *parent = CFCClass_get_parent(client);
CFCMethod **methods = CFCClass_methods(client);
@@ -323,18 +331,6 @@ CFCBindClass_get_client(CFCBindClass *se
}
const char*
-CFCBindClass_full_callbacks_var(CFCBindClass *self)
-{
- return self->full_callbacks_var;
-}
-
-const char*
-CFCBindClass_full_name_var(CFCBindClass *self)
-{
- return self->full_name_var;
-}
-
-const char*
CFCBindClass_short_names_macro(CFCBindClass *self)
{
return self->short_names_macro;
Modified: incubator/lucy/trunk/clownfish/src/CFCBindClass.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCBindClass.h?rev=1139379&r1=1139378&r2=1139379&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCBindClass.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCBindClass.h Fri Jun 24 16:36:11 2011
@@ -40,22 +40,10 @@ CFCBindClass_to_c(CFCBindClass *self);
char*
CFCBindClass_struct_definition(CFCBindClass *self);
-char*
-CFCBindClass_name_var_definition(CFCBindClass *self);
-
-char*
-CFCBindClass_vtable_definition(CFCBindClass *self);
-
struct CFCClass*
CFCBindClass_get_client(struct CFCBindClass *self);
const char*
-CFCBindClass_full_callbacks_var(CFCBindClass *self);
-
-const char*
-CFCBindClass_full_name_var(CFCBindClass *self);
-
-const char*
CFCBindClass_short_names_macro(CFCBindClass *self);
#ifdef __cplusplus