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/21 03:19:43 UTC

[lucy-commits] svn commit: r1137835 - in /incubator/lucy/trunk/clownfish/src: CFCBindMethod.c CFCClass.c CFCClass.h CFCDumpable.c CFCFunction.c CFCFunction.h CFCHierarchy.c CFCMethod.c CFCMethod.h CFCParamList.c CFCVariable.c CFCVariable.h

Author: marvin
Date: Tue Jun 21 01:19:42 2011
New Revision: 1137835

URL: http://svn.apache.org/viewvc?rev=1137835&view=rev
Log:
Cut down on casting to CFCSymbol* by introducing wrapper functions.

Modified:
    incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
    incubator/lucy/trunk/clownfish/src/CFCClass.c
    incubator/lucy/trunk/clownfish/src/CFCClass.h
    incubator/lucy/trunk/clownfish/src/CFCDumpable.c
    incubator/lucy/trunk/clownfish/src/CFCFunction.c
    incubator/lucy/trunk/clownfish/src/CFCFunction.h
    incubator/lucy/trunk/clownfish/src/CFCHierarchy.c
    incubator/lucy/trunk/clownfish/src/CFCMethod.c
    incubator/lucy/trunk/clownfish/src/CFCMethod.h
    incubator/lucy/trunk/clownfish/src/CFCParamList.c
    incubator/lucy/trunk/clownfish/src/CFCVariable.c
    incubator/lucy/trunk/clownfish/src/CFCVariable.h

Modified: incubator/lucy/trunk/clownfish/src/CFCBindMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCBindMethod.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCBindMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCBindMethod.c Tue Jun 21 01:19:42 2011
@@ -58,7 +58,7 @@ CFCBindMeth_abstract_method_def(CFCMetho
     char *unused = CFCUtil_strdup("");
     CFCVariable **param_vars = CFCParamList_get_variables(param_list);
     for (int i = 1; param_vars[i] != NULL; i++) {
-        const char *var_name = CFCSymbol_micro_sym((CFCSymbol*)param_vars[i]);
+        const char *var_name = CFCVariable_micro_sym(param_vars[i]);
         size_t size = strlen(unused) + strlen(var_name) + 80;
         unused = (char*)REALLOCATE(unused, size);
         strcat(unused, "\n    CHY_UNUSED_VAR(");

Modified: incubator/lucy/trunk/clownfish/src/CFCClass.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCClass.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCClass.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCClass.c Tue Jun 21 01:19:42 2011
@@ -157,7 +157,7 @@ CFCClass_do_create(CFCClass *self, struc
     self->struct_sym = last_colon
                        ? CFCUtil_strdup(last_colon + 1)
                        : CFCUtil_strdup(class_name);
-    const char *prefix = CFCSymbol_get_prefix((CFCSymbol*)self);
+    const char *prefix = CFCClass_get_prefix(self);
     size_t prefix_len = strlen(prefix);
     size_t struct_sym_len = strlen(self->struct_sym);
     self->short_vtable_var = (char*)MALLOCATE(struct_sym_len + 1);
@@ -261,14 +261,14 @@ CFCClass_register(CFCClass *self) {
         }
         registry_cap = new_cap;
     }
-    CFCParcel *parcel = CFCSymbol_get_parcel((CFCSymbol*)self);
-    const char *class_name = CFCSymbol_get_class_name((CFCSymbol*)self);
+    CFCParcel *parcel = CFCClass_get_parcel(self);
+    const char *class_name = CFCClass_get_class_name(self);
     CFCClass *existing = CFCClass_fetch_singleton(parcel, class_name);
     const char *key = self->full_struct_sym;
     if (existing) {
         croak("New class %s conflicts with existing class %s",
-              CFCSymbol_get_class_name((CFCSymbol*)self),
-              CFCSymbol_get_class_name((CFCSymbol*)existing));
+              CFCClass_get_class_name(self),
+              CFCClass_get_class_name(existing));
     }
     registry[registry_size].key   = CFCUtil_strdup(key);
     registry[registry_size].klass = (CFCClass*)CFCBase_incref((CFCBase*)self);
@@ -427,8 +427,7 @@ S_find_func(CFCFunction **funcs, const c
     }
     for (i = 0; funcs[i] != NULL; i++) {
         CFCFunction *func = funcs[i];
-        const char *func_micro_sym = CFCSymbol_micro_sym((CFCSymbol*)func);
-        if (strcmp(lcsym, func_micro_sym) == 0) {
+        if (strcmp(lcsym, CFCFunction_micro_sym(func)) == 0) {
             return func;
         }
     }
@@ -450,8 +449,7 @@ CFCClass_novel_method(CFCClass *self, co
     CFCMethod *method = CFCClass_method(self, sym);
     if (method) {
         const char *cnick = CFCClass_get_cnick(self);
-        const char *meth_cnick
-            = CFCSymbol_get_class_cnick((CFCSymbol*)method);
+        const char *meth_cnick = CFCMethod_get_class_cnick(method);
         if (strcmp(cnick, meth_cnick) == 0) {
             return method;
         }
@@ -500,8 +498,8 @@ S_bequeath_methods(CFCClass *self) {
         size_t i;
         for (i = 0; i < self->num_methods; i++) {
             CFCMethod *method = self->methods[i];
-            const char *micro_sym = CFCSymbol_micro_sym((CFCSymbol*)method);
-            CFCMethod *child_method = CFCClass_method(child, micro_sym);
+            const char *macro_sym = CFCMethod_get_macro_sym(method);
+            CFCMethod *child_method = CFCClass_method(child, macro_sym);
             if (child_method) {
                 CFCMethod_override(child_method, method);
                 methods[num_methods++] = child_method;
@@ -623,7 +621,7 @@ CFCClass_tree_to_ladder(CFCClass *self) 
 
 static CFCSymbol**
 S_novel_syms(CFCClass *self, CFCSymbol **syms) {
-    const char *cnick = CFCSymbol_get_class_cnick((CFCSymbol*)self);
+    const char *cnick = CFCClass_get_cnick(self);
     size_t count = 0;
     while (syms[count] != NULL) { count++; }
     size_t amount = (count + 1) * sizeof(CFCSymbol*);
@@ -632,7 +630,7 @@ S_novel_syms(CFCClass *self, CFCSymbol *
     size_t i;
     for (i = 0; i < count; i++) {
         CFCSymbol *sym = syms[i];
-        const char *sym_cnick = CFCSymbol_get_class_cnick((CFCSymbol*)sym);
+        const char *sym_cnick = CFCSymbol_get_class_cnick(sym);
         if (strcmp(sym_cnick, cnick) == 0) {
             novel[num_novel++] = sym;
         }
@@ -759,3 +757,18 @@ CFCClass_get_docucomment(CFCClass *self)
     return self->docucomment;
 }
 
+const char*
+CFCClass_get_prefix(CFCClass *self) {
+    return CFCSymbol_get_prefix((CFCSymbol*)self);
+}
+
+const char*
+CFCClass_get_class_name(CFCClass *self) {
+    return CFCSymbol_get_class_name((CFCSymbol*)self);
+}
+
+CFCParcel*
+CFCClass_get_parcel(CFCClass *self) {
+    return CFCSymbol_get_parcel((CFCSymbol*)self);
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCClass.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCClass.h?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCClass.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCClass.h Tue Jun 21 01:19:42 2011
@@ -160,6 +160,15 @@ CFCClass_include_h(CFCClass *self);
 struct CFCDocuComment*
 CFCClass_get_docucomment(CFCClass *self);
 
+const char*
+CFCClass_get_prefix(CFCClass *self);
+
+const char*
+CFCClass_get_class_name(CFCClass *self);
+
+struct CFCParcel*
+CFCClass_get_parcel(CFCClass *self);
+
 #ifdef __cplusplus
 }
 #endif

Modified: incubator/lucy/trunk/clownfish/src/CFCDumpable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCDumpable.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCDumpable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCDumpable.c Tue Jun 21 01:19:42 2011
@@ -86,8 +86,7 @@ CFCDumpable_add_dumpables(CFCDumpable *s
     (void)self;
 
     if (!CFCClass_has_attribute(klass, "dumpable")) {
-        croak("Class %s isn't dumpable",
-              CFCSymbol_get_class_name((CFCSymbol*)klass));
+        croak("Class %s isn't dumpable", CFCClass_get_class_name(klass));
     }
 
     // Inherit Dump/Load from parent if no novel member vars.
@@ -110,9 +109,9 @@ CFCDumpable_add_dumpables(CFCDumpable *s
 static CFCMethod*
 S_make_method_obj(CFCClass *klass, const char *method_name) {
     const char *klass_struct_sym = CFCClass_get_struct_sym(klass);
-    const char *klass_name   = CFCSymbol_get_class_name((CFCSymbol*)klass);
-    const char *klass_cnick  = CFCSymbol_get_class_cnick((CFCSymbol*)klass);
-    CFCParcel  *klass_parcel = CFCSymbol_get_parcel((CFCSymbol*)klass);
+    const char *klass_name   = CFCClass_get_class_name(klass);
+    const char *klass_cnick  = CFCClass_get_cnick(klass);
+    CFCParcel  *klass_parcel = CFCClass_get_parcel(klass);
     CFCParcel  *cf_parcel    = CFCParcel_clownfish_parcel();
 
     CFCType *return_type
@@ -299,7 +298,7 @@ S_process_dump_member(CFCClass *klass, C
                       size_t buf_size) {
     CFCUTIL_NULL_CHECK(member);
     CFCType *type = CFCVariable_get_type(member);
-    const char *name = CFCSymbol_micro_sym((CFCSymbol*)member);
+    const char *name = CFCVariable_micro_sym(member);
     unsigned name_len = (unsigned)strlen(name);
     const char *specifier = CFCType_get_specifier(type);
 
@@ -352,7 +351,7 @@ S_process_load_member(CFCClass *klass, C
     CFCUTIL_NULL_CHECK(member);
     CFCType *type = CFCVariable_get_type(member);
     const char *type_str = CFCType_to_c(type);
-    const char *name = CFCSymbol_micro_sym((CFCSymbol*)member);
+    const char *name = CFCVariable_micro_sym(member);
     unsigned name_len = (unsigned)strlen(name);
     char extraction[200];
     const char *specifier = CFCType_get_specifier(type);

Modified: incubator/lucy/trunk/clownfish/src/CFCFunction.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCFunction.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCFunction.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCFunction.c Tue Jun 21 01:19:42 2011
@@ -124,3 +124,8 @@ CFCFunction_short_func_sym(CFCFunction *
     return CFCSymbol_short_sym((CFCSymbol*)self);
 }
 
+const char*
+CFCFunction_micro_sym(CFCFunction *self) {
+    return CFCSymbol_micro_sym((CFCSymbol*)self);
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCFunction.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCFunction.h?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCFunction.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCFunction.h Tue Jun 21 01:19:42 2011
@@ -78,6 +78,9 @@ CFCFunction_full_func_sym(CFCFunction *s
 const char*
 CFCFunction_short_func_sym(CFCFunction *self);
 
+const char*
+CFCFunction_micro_sym(CFCFunction *self);
+
 #ifdef __cplusplus
 }
 #endif

Modified: incubator/lucy/trunk/clownfish/src/CFCHierarchy.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCHierarchy.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCHierarchy.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCHierarchy.c Tue Jun 21 01:19:42 2011
@@ -300,7 +300,7 @@ S_parse_cf_files(CFCHierarchy *self) {
                     CFCUtil_die("Parent class '%s' not defined", parent_name);
                 }
                 const char *maybe_parent_name
-                    = CFCSymbol_get_class_name((CFCSymbol*)maybe_parent);
+                    = CFCClass_get_class_name(maybe_parent);
                 if (strcmp(parent_name, maybe_parent_name) == 0) {
                     CFCClass_add_child(maybe_parent, klass);
                     break;
@@ -365,8 +365,8 @@ S_do_propagate_modified(CFCHierarchy *se
         CFCClass *kid = children[i];
         if (CFCClass_final(klass)) {
             CFCUtil_die("Attempt to inherit from final class '%s' by '%s'",
-                        CFCSymbol_get_class_name((CFCSymbol*)klass),
-                        CFCSymbol_get_class_name((CFCSymbol*)kid));
+                        CFCClass_get_class_name(klass),
+                        CFCClass_get_class_name(kid));
         }
         if (S_do_propagate_modified(self, kid, modified)) {
             somebody_is_modified = 1;
@@ -448,12 +448,11 @@ S_add_file(CFCHierarchy *self, CFCFile *
         CFCClass **existing_classes = CFCFile_classes(existing);
         size_t j;
         for (j = 0; classes[j] != NULL; j++) {
-            const char *new_class_name
-                = CFCSymbol_get_class_name((CFCSymbol*)classes[j]);
+            const char *new_class_name = CFCClass_get_class_name(classes[j]);
             size_t k;
             for (k = 0; existing_classes[k] != NULL; k++) {
                 const char *existing_class_name
-                    = CFCSymbol_get_class_name((CFCSymbol*)existing_classes[k]);
+                    = CFCClass_get_class_name(existing_classes[k]);
                 if (strcmp(new_class_name, existing_class_name) == 0) {
                     CFCUtil_die("Class '%s' already registered",
                                 new_class_name);

Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.c Tue Jun 21 01:19:42 2011
@@ -111,7 +111,7 @@ CFCMethod_init(CFCMethod *self, CFCParce
     if (!args[0]) { croak("Missing 'self' argument"); }
     CFCType *type = CFCVariable_get_type(args[0]);
     const char *specifier = CFCType_get_specifier(type);
-    const char *prefix    = CFCSymbol_get_prefix((CFCSymbol*)self);
+    const char *prefix    = CFCMethod_get_prefix(self);
     const char *last_colon = strrchr(class_name, ':');
     const char *struct_sym = last_colon ? last_colon + 1 : class_name;
     char *wanted = (char*)MALLOCATE(strlen(prefix) + strlen(struct_sym) + 1);
@@ -164,8 +164,8 @@ int
 CFCMethod_compatible(CFCMethod *self, CFCMethod *other) {
     if (!other) { return false; }
     if (strcmp(self->macro_sym, other->macro_sym)) { return false; }
-    int my_public = CFCSymbol_public((CFCSymbol*)self);
-    int other_public = CFCSymbol_public((CFCSymbol*)self);
+    int my_public = CFCMethod_public(self);
+    int other_public = CFCMethod_public(self);
     if (!!my_public != !!other_public) { return false; }
 
     // Check arguments and initial values.
@@ -211,8 +211,8 @@ void
 CFCMethod_override(CFCMethod *self, CFCMethod *orig) {
     // Check that the override attempt is legal.
     if (CFCMethod_final(orig)) {
-        const char *orig_class = CFCSymbol_get_class_name((CFCSymbol*)orig);
-        const char *my_class   = CFCSymbol_get_class_name((CFCSymbol*)self);
+        const char *orig_class = CFCMethod_get_class_name(orig);
+        const char *my_class   = CFCMethod_get_class_name(self);
         croak("Attempt to override final method '%s' from '%s' by '%s'",
               orig->macro_sym, orig_class, my_class);
     }
@@ -228,11 +228,10 @@ CFCMethod_override(CFCMethod *self, CFCM
 
 CFCMethod*
 CFCMethod_finalize(CFCMethod *self) {
-    CFCSymbol  *self_sym    = (CFCSymbol*)self;
-    CFCParcel  *parcel      = CFCSymbol_get_parcel(self_sym);
-    const char *exposure    = CFCSymbol_get_exposure(self_sym);
-    const char *class_name  = CFCSymbol_get_class_name(self_sym);
-    const char *class_cnick = CFCSymbol_get_class_cnick(self_sym);
+    CFCParcel  *parcel      = CFCMethod_get_parcel(self);
+    const char *exposure    = CFCMethod_get_exposure(self);
+    const char *class_name  = CFCMethod_get_class_name(self);
+    const char *class_cnick = CFCMethod_get_class_cnick(self);
     CFCMethod  *finalized
         = CFCMethod_new(parcel, exposure, class_name, class_cnick,
                         self->macro_sym, self->function.return_type,
@@ -260,7 +259,7 @@ size_t
 CFCMethod_full_method_sym(CFCMethod *self, const char *invoker, char *buf,
                           size_t buf_size) {
     CFCUTIL_NULL_CHECK(invoker);
-    const char *Prefix = CFCSymbol_get_Prefix((CFCSymbol*)self);
+    const char *Prefix = CFCMethod_get_Prefix(self);
     size_t needed = strlen(Prefix)
                     + strlen(invoker)
                     + 1
@@ -296,7 +295,7 @@ S_update_typedefs(CFCMethod *self, const
     FREEMEM(self->short_typedef);
     FREEMEM(self->full_typedef);
     if (short_sym) {
-        const char *prefix = CFCSymbol_get_prefix((CFCSymbol*)self);
+        const char *prefix = CFCMethod_get_prefix(self);
         size_t amount = strlen(short_sym) + 3;
         self->short_typedef = (char*)MALLOCATE(amount);
         int check = sprintf(self->short_typedef, "%s_t", short_sym);
@@ -353,3 +352,38 @@ CFCMethod_self_type(CFCMethod *self) {
     return CFCVariable_get_type(vars[0]);
 }
 
+CFCParcel*
+CFCMethod_get_parcel(CFCMethod *self) {
+    return CFCSymbol_get_parcel((CFCSymbol*)self);
+}
+
+const char*
+CFCMethod_get_prefix(CFCMethod *self) {
+    return CFCSymbol_get_prefix((CFCSymbol*)self);
+}
+
+const char*
+CFCMethod_get_Prefix(CFCMethod *self) {
+    return CFCSymbol_get_Prefix((CFCSymbol*)self);
+}
+
+const char*
+CFCMethod_get_exposure(CFCMethod *self) {
+    return CFCSymbol_get_exposure((CFCSymbol*)self);
+}
+
+const char*
+CFCMethod_get_class_name(CFCMethod *self) {
+    return CFCSymbol_get_class_name((CFCSymbol*)self);
+}
+
+const char*
+CFCMethod_get_class_cnick(CFCMethod *self) {
+    return CFCSymbol_get_class_cnick((CFCSymbol*)self);
+}
+
+int
+CFCMethod_public(CFCMethod *self) {
+    return CFCSymbol_public((CFCSymbol*)self);
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCMethod.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCMethod.h?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCMethod.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCMethod.h Tue Jun 21 01:19:42 2011
@@ -103,6 +103,27 @@ CFCMethod_novel(CFCMethod *self);
 struct CFCType*
 CFCMethod_self_type(CFCMethod *self);
 
+struct CFCParcel*
+CFCMethod_get_parcel(CFCMethod *self);
+
+const char*
+CFCMethod_get_prefix(CFCMethod *self);
+
+const char*
+CFCMethod_get_Prefix(CFCMethod *self);
+
+const char*
+CFCMethod_get_exposure(CFCMethod *self);
+
+const char*
+CFCMethod_get_class_name(CFCMethod *self);
+
+const char*
+CFCMethod_get_class_cnick(CFCMethod *self);
+
+int
+CFCMethod_public(CFCMethod *self);
+
 #ifdef __cplusplus
 }
 #endif

Modified: incubator/lucy/trunk/clownfish/src/CFCParamList.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParamList.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParamList.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParamList.c Tue Jun 21 01:19:42 2011
@@ -101,7 +101,7 @@ S_generate_c_strings(CFCParamList *self)
         c_string_size += sizeof(", ");
         c_string_size += strlen(CFCVariable_local_c(var));
         name_list_size += sizeof(", ");
-        name_list_size += strlen(CFCSymbol_micro_sym((CFCSymbol*)var));
+        name_list_size += strlen(CFCVariable_micro_sym(var));
     }
     if (self->variadic) {
         c_string_size += sizeof(", ...");
@@ -117,7 +117,7 @@ S_generate_c_strings(CFCParamList *self)
     for (i = 0; i < self->num_vars; i++) {
         CFCVariable *var = self->variables[i];
         strcat(self->c_string, CFCVariable_local_c(var));
-        strcat(self->name_list, CFCSymbol_micro_sym((CFCSymbol*)var));
+        strcat(self->name_list, CFCVariable_micro_sym(var));
         if (i == self->num_vars - 1) {
             if (self->variadic) {
                 strcat(self->c_string, ", ...");

Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.c?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.c Tue Jun 21 01:19:42 2011
@@ -86,7 +86,7 @@ CFCVariable_init(CFCVariable *self, stru
         sprintf(self->local_dec, "%s;", self->local_c);
     }
     {
-        const char *full_sym = CFCSymbol_full_sym((CFCSymbol*)self);
+        const char *full_sym = CFCVariable_full_sym(self);
         size_t size = strlen(type_str) + sizeof(" ") + strlen(full_sym) +
                       strlen(postfix) + 1;
         self->global_c = (char*)MALLOCATE(size);
@@ -131,3 +131,13 @@ CFCVariable_local_declaration(CFCVariabl
     return self->local_dec;
 }
 
+const char*
+CFCVariable_micro_sym(CFCVariable *self) {
+    return CFCSymbol_micro_sym((CFCSymbol*)self);
+}
+
+const char*
+CFCVariable_full_sym(CFCVariable *self) {
+    return CFCSymbol_full_sym((CFCSymbol*)self);
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCVariable.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCVariable.h?rev=1137835&r1=1137834&r2=1137835&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCVariable.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCVariable.h Tue Jun 21 01:19:42 2011
@@ -54,6 +54,12 @@ CFCVariable_global_c(CFCVariable *self);
 const char*
 CFCVariable_local_declaration(CFCVariable *self);
 
+const char*
+CFCVariable_micro_sym(CFCVariable *self);
+
+const char*
+CFCVariable_full_sym(CFCVariable *self);
+
 #ifdef __cplusplus
 }
 #endif