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/02/20 05:23:57 UTC

[lucy-commits] svn commit: r1072491 - in /incubator/lucy/trunk/clownfish: lib/Clownfish.xs lib/Clownfish/ParamList.pm src/CFCParamList.c src/CFCParamList.h

Author: marvin
Date: Sun Feb 20 04:23:57 2011
New Revision: 1072491

URL: http://svn.apache.org/viewvc?rev=1072491&view=rev
Log:
Finish porting CFCParamList to C.

Modified:
    incubator/lucy/trunk/clownfish/lib/Clownfish.xs
    incubator/lucy/trunk/clownfish/lib/Clownfish/ParamList.pm
    incubator/lucy/trunk/clownfish/src/CFCParamList.c
    incubator/lucy/trunk/clownfish/src/CFCParamList.h

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish.xs
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish.xs?rev=1072491&r1=1072490&r2=1072491&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish.xs (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish.xs Sun Feb 20 04:23:57 2011
@@ -524,6 +524,8 @@ ALIAS:
     get_initial_values = 4
     variadic           = 6
     num_vars           = 8
+    to_c               = 10
+    name_list          = 12
 PPCODE:
 {
     START_SET_OR_GET_SWITCH
@@ -564,6 +566,16 @@ PPCODE:
         case 8:
             retval = newSViv(CFCParamList_num_vars(self));
             break;
+        case 10: {
+                const char *value = CFCParamList_to_c(self);
+                retval = newSVpv(value, strlen(value));
+            }
+            break;
+        case 12: {
+                const char *value = CFCParamList_name_list(self);
+                retval = newSVpv(value, strlen(value));
+            }
+            break;
     END_SET_OR_GET_SWITCH
 }
 

Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/ParamList.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/ParamList.pm?rev=1072491&r1=1072490&r2=1072491&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/ParamList.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/ParamList.pm Sun Feb 20 04:23:57 2011
@@ -31,18 +31,6 @@ sub new {
     return $class_name->_new($variadic);
 }
 
-sub to_c {
-    my $self = shift;
-    my $string = join( ', ', map { $_->local_c } @{ $self->get_variables } );
-    $string .= ", ..." if $self->variadic;
-    return $string;
-}
-
-sub name_list {
-    my $self = shift;
-    return join( ', ', map { $_->micro_sym } @{ $self->get_variables } );
-}
-
 1;
 
 __END__

Modified: incubator/lucy/trunk/clownfish/src/CFCParamList.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParamList.c?rev=1072491&r1=1072490&r2=1072491&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParamList.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParamList.c Sun Feb 20 04:23:57 2011
@@ -23,6 +23,7 @@
 #include "CFCBase.h"
 #include "CFCParamList.h"
 #include "CFCVariable.h"
+#include "CFCSymbol.h"
 #include "CFCUtil.h"
 
 struct CFCParamList {
@@ -31,8 +32,14 @@ struct CFCParamList {
     char        **values;
     int           variadic;
     size_t        num_vars;
+    char         *c_string;
+    char         *name_list;
 };
 
+// 
+static void
+S_generate_c_strings(CFCParamList *self);
+
 CFCParamList*
 CFCParamList_new(int variadic)
 {
@@ -48,6 +55,7 @@ CFCParamList_init(CFCParamList *self, in
     self->num_vars  = 0;
     self->variables = (CFCVariable**)calloc(1, sizeof(void*));
     self->values    = (char**)calloc(1, sizeof(char*));
+    S_generate_c_strings(self);
     return self;
 }
 
@@ -68,6 +76,8 @@ CFCParamList_add_param(CFCParamList *sel
     self->values[self->num_vars - 1] = value ? CFCUtil_strdup(value) : NULL;
     self->variables[self->num_vars] = NULL;
     self->values[self->num_vars] = NULL;
+
+    S_generate_c_strings(self);
 }
 
 void
@@ -80,9 +90,54 @@ CFCParamList_destroy(CFCParamList *self)
     }
     free(self->variables);
     free(self->values);
+    free(self->c_string);
+    free(self->name_list);
     CFCBase_destroy((CFCBase*)self);
 }
 
+static void
+S_generate_c_strings(CFCParamList *self)
+{
+    size_t c_string_size = 1;
+    size_t name_list_size = 1;
+    size_t i;
+
+    // Calc space requirements and allocate memory.
+    for (i = 0; i < self->num_vars; i++) {
+        CFCVariable *var = self->variables[i];
+        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));
+    }
+    if (self->variadic) {
+        c_string_size += sizeof(", ...");
+    }
+    free(self->c_string);
+    free(self->name_list);
+    self->c_string  = malloc(c_string_size);
+    self->name_list = malloc(name_list_size);
+    if (!self->c_string || !self->name_list) { croak("malloc failed"); }
+    self->c_string[0] = '\0';
+    self->name_list[0] = '\0';
+
+    // Build the strings.
+    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));
+        if (i == self->num_vars - 1) {
+            if (self->variadic) {
+                strcat(self->c_string, ", ...");
+            }
+        }
+        else {
+            strcat(self->c_string, ", ");
+            strcat(self->name_list, ", ");
+        }
+    }
+}
+
 CFCVariable**
 CFCParamList_get_variables(CFCParamList *self)
 {
@@ -107,3 +162,15 @@ CFCParamList_variadic(CFCParamList *self
     return self->variadic;
 }
 
+const char*
+CFCParamList_to_c(CFCParamList *self)
+{
+    return self->c_string;
+}
+
+const char*
+CFCParamList_name_list(CFCParamList *self)
+{
+    return self->name_list;
+}
+

Modified: incubator/lucy/trunk/clownfish/src/CFCParamList.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCParamList.h?rev=1072491&r1=1072490&r2=1072491&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCParamList.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCParamList.h Sun Feb 20 04:23:57 2011
@@ -45,5 +45,11 @@ CFCParamList_variadic(CFCParamList *self
 size_t
 CFCParamList_num_vars(CFCParamList *self);
 
+const char*
+CFCParamList_to_c(CFCParamList *self);
+
+const char*
+CFCParamList_name_list(CFCParamList *self);
+
 #endif /* H_CFCPARAMLIST */