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/26 04:32:26 UTC
[lucy-commits] svn commit: r1074786 - in /incubator/lucy/trunk/clownfish: lib/Clownfish.xs
lib/Clownfish/Class.pm src/CFCClass.c src/CFCClass.h
Author: marvin
Date: Sat Feb 26 03:32:25 2011
New Revision: 1074786
URL: http://svn.apache.org/viewvc?rev=1074786&view=rev
Log:
Move member_vars and inert_vars members of CFCClass from Perl to C.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish.xs
incubator/lucy/trunk/clownfish/lib/Clownfish/Class.pm
incubator/lucy/trunk/clownfish/src/CFCClass.c
incubator/lucy/trunk/clownfish/src/CFCClass.h
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish.xs
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish.xs?rev=1074786&r1=1074785&r2=1074786&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish.xs (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish.xs Sat Feb 26 03:32:25 2011
@@ -136,6 +136,26 @@ PPCODE:
CFCClass_add_child(self, child);
void
+add_member_var(self, var)
+ CFCClass *self;
+ CFCVariable *var;
+PPCODE:
+ CFCClass_add_member_var(self, var);
+
+void
+_bequeath_member_vars(self)
+ CFCClass *self;
+PPCODE:
+ CFCClass_bequeath_member_vars(self);
+
+void
+add_inert_var(self, var)
+ CFCClass *self;
+ CFCVariable *var;
+PPCODE:
+ CFCClass_add_inert_var(self, var);
+
+void
_set_or_get(self, ...)
CFCClass *self;
ALIAS:
@@ -157,6 +177,8 @@ ALIAS:
include_h = 28
get_docucomment = 30
children = 32
+ member_vars = 34
+ inert_vars = 36
PPCODE:
{
START_SET_OR_GET_SWITCH
@@ -259,6 +281,30 @@ PPCODE:
SvREFCNT_dec(av);
break;
}
+ case 34: {
+ AV *av = newAV();
+ CFCVariable **vars = CFCClass_member_vars(self);
+ size_t i;
+ for (i = 0; vars[i] != NULL; i++) {
+ SV *val = newRV(CFCBase_get_perl_obj((CFCBase*)vars[i]));
+ av_store(av, i, val);
+ }
+ retval = newRV((SV*)av);
+ SvREFCNT_dec(av);
+ break;
+ }
+ case 36: {
+ AV *av = newAV();
+ CFCVariable **vars = CFCClass_inert_vars(self);
+ size_t i;
+ for (i = 0; vars[i] != NULL; i++) {
+ SV *val = newRV(CFCBase_get_perl_obj((CFCBase*)vars[i]));
+ av_store(av, i, val);
+ }
+ retval = newRV((SV*)av);
+ SvREFCNT_dec(av);
+ break;
+ }
END_SET_OR_GET_SWITCH
}
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Class.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Class.pm?rev=1074786&r1=1074785&r2=1074786&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Class.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Class.pm Sat Feb 26 03:32:25 2011
@@ -36,8 +36,6 @@ our %meth_by_name;
our %func_by_name;
our %functions;
our %methods;
-our %member_vars;
-our %inert_vars;
our %overridden;
our %create_PARAMS = (
@@ -116,8 +114,6 @@ sub create {
$func_by_name{$self} = {};
$functions{$self} = [];
$methods{$self} = [];
- $member_vars{$self} = [];
- $inert_vars{$self} = [];
$overridden{$self} = {};
# Store in registry.
@@ -140,8 +136,6 @@ sub DESTROY {
delete $func_by_name{$self};
delete $functions{$self};
delete $methods{$self};
- delete $member_vars{$self};
- delete $inert_vars{$self};
delete $overridden{$self};
$self->_destroy;
}
@@ -156,8 +150,6 @@ sub _set_methods { $methods{ $_[0] }
sub functions { $functions{ +shift } }
sub methods { $methods{ +shift } }
-sub member_vars { $member_vars{ +shift } }
-sub inert_vars { $inert_vars{ +shift } }
sub novel_methods {
my $self = shift;
@@ -214,20 +206,6 @@ sub add_function {
$self->_func_by_name->{ $function->micro_sym } = $function;
}
-sub add_member_var {
- my ( $self, $var ) = @_;
- confess("Not a Variable") unless a_isa_b( $var, "Clownfish::Variable" );
- confess("Can't call add_member_var after grow_tree") if $self->_tree_grown;
- push @{ $self->member_vars }, $var;
-}
-
-sub add_inert_var {
- my ( $self, $var ) = @_;
- confess("Not a Variable") unless a_isa_b( $var, "Clownfish::Variable" );
- confess("Can't call add_inert_var after grow_tree") if $self->_tree_grown;
- push @{ $self->inert_vars }, $var;
-}
-
# Create dumpable functions unless hand coded versions were supplied.
sub _create_dumpables {
my $self = shift;
@@ -255,15 +233,6 @@ sub _establish_ancestry {
}
}
-# Pass down member vars to from parent to children.
-sub _bequeath_member_vars {
- my $self = shift;
- for my $child ( @{ $self->children } ) {
- unshift @{ $child->member_vars }, @{ $self->member_vars };
- $child->_bequeath_member_vars;
- }
-}
-
# Create auto-generated methods. This must be called after member vars are
# passed down but before methods are passed down.
sub _generate_automethods {
Modified: incubator/lucy/trunk/clownfish/src/CFCClass.c
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCClass.c?rev=1074786&r1=1074785&r2=1074786&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCClass.c (original)
+++ incubator/lucy/trunk/clownfish/src/CFCClass.c Sat Feb 26 03:32:25 2011
@@ -32,6 +32,7 @@
#include "CFCParcel.h"
#include "CFCDocuComment.h"
#include "CFCUtil.h"
+#include "CFCVariable.h"
struct CFCClass {
CFCSymbol symbol;
@@ -40,6 +41,10 @@ struct CFCClass {
struct CFCClass *parent;
struct CFCClass **children;
size_t num_kids;
+ CFCVariable **member_vars;
+ size_t num_member_vars;
+ CFCVariable **inert_vars;
+ size_t num_inert_vars;
char *autocode;
char *source_class;
char *parent_class_name;
@@ -79,8 +84,12 @@ CFCClass_init(CFCClass *self, struct CFC
self->parent = NULL;
self->tree_grown = false;
self->autocode = (char*)CALLOCATE(1, sizeof(char));
- self->children = (CFCClass**)CALLOCATE(1, sizeof(CFCClass*));
- self->num_kids = 0;
+ self->children = (CFCClass**)CALLOCATE(1, sizeof(CFCClass*));
+ self->num_kids = 0;
+ self->member_vars = (CFCVariable**)CALLOCATE(1, sizeof(CFCVariable*));
+ self->num_member_vars = 0;
+ self->inert_vars = (CFCVariable**)CALLOCATE(1, sizeof(CFCVariable*));
+ self->num_inert_vars = 0;
self->parent_class_name = CFCUtil_strdup(parent_class_name);
self->docucomment
= (CFCDocuComment*)CFCBase_incref((CFCBase*)docucomment);
@@ -148,7 +157,15 @@ CFCClass_destroy(CFCClass *self)
for (i = 0; self->children[i] != NULL; i++) {
CFCBase_decref((CFCBase*)self->children[i]);
}
+ for (i = 0; self->member_vars[i] != NULL; i++) {
+ CFCBase_decref((CFCBase*)self->member_vars[i]);
+ }
+ for (i = 0; self->inert_vars[i] != NULL; i++) {
+ CFCBase_decref((CFCBase*)self->inert_vars[i]);
+ }
FREEMEM(self->children);
+ FREEMEM(self->member_vars);
+ FREEMEM(self->inert_vars);
FREEMEM(self->autocode);
FREEMEM(self->source_class);
FREEMEM(self->parent_class_name);
@@ -173,12 +190,80 @@ CFCClass_add_child(CFCClass *self, CFCCl
self->children[self->num_kids] = NULL;
}
+void
+CFCClass_add_member_var(CFCClass *self, CFCVariable *var)
+{
+ CFCUTIL_NULL_CHECK(var);
+ if (self->tree_grown) {
+ croak("Can't call add_member_var after grow_tree");
+ }
+ self->num_member_vars++;
+ size_t size = (self->num_member_vars + 1) * sizeof(CFCVariable*);
+ self->member_vars = (CFCVariable**)REALLOCATE(self->member_vars, size);
+ self->member_vars[self->num_member_vars - 1]
+ = (CFCVariable*)CFCBase_incref((CFCBase*)var);
+ self->member_vars[self->num_member_vars] = NULL;
+}
+
+void
+CFCClass_add_inert_var(CFCClass *self, CFCVariable *var)
+{
+ CFCUTIL_NULL_CHECK(var);
+ if (self->tree_grown) {
+ croak("Can't call add_inert_var after grow_tree");
+ }
+ self->num_inert_vars++;
+ size_t size = (self->num_inert_vars + 1) * sizeof(CFCVariable*);
+ self->inert_vars = (CFCVariable**)REALLOCATE(self->inert_vars, size);
+ self->inert_vars[self->num_inert_vars - 1]
+ = (CFCVariable*)CFCBase_incref((CFCBase*)var);
+ self->inert_vars[self->num_inert_vars] = NULL;
+}
+
+// Pass down member vars to from parent to children.
+void
+CFCClass_bequeath_member_vars(CFCClass *self)
+{
+ size_t i;
+ for (i = 0; self->children[i] != NULL; i++) {
+ CFCClass *child = self->children[i];
+ size_t num_vars = self->num_member_vars + child->num_member_vars;
+ size_t size = (num_vars + 1) * sizeof(CFCVariable*);
+ child->member_vars
+ = (CFCVariable**)REALLOCATE(child->member_vars, size);
+ memmove(child->member_vars + self->num_member_vars,
+ child->member_vars,
+ child->num_member_vars * sizeof(CFCVariable*));
+ memcpy(child->member_vars, self->member_vars,
+ self->num_member_vars * sizeof(CFCVariable*));
+ size_t j;
+ for (j = 0; self->member_vars[j] != NULL; j++) {
+ CFCBase_incref((CFCBase*)child->member_vars[j]);
+ }
+ child->num_member_vars = num_vars;
+ child->member_vars[num_vars] = NULL;
+ CFCClass_bequeath_member_vars(child);
+ }
+}
+
CFCClass**
CFCClass_children(CFCClass *self)
{
return self->children;
}
+CFCVariable**
+CFCClass_member_vars(CFCClass *self)
+{
+ return self->member_vars;
+}
+
+CFCVariable**
+CFCClass_inert_vars(CFCClass *self)
+{
+ return self->inert_vars;
+}
+
const char*
CFCClass_get_cnick(CFCClass *self)
{
Modified: incubator/lucy/trunk/clownfish/src/CFCClass.h
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/src/CFCClass.h?rev=1074786&r1=1074785&r2=1074786&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/src/CFCClass.h (original)
+++ incubator/lucy/trunk/clownfish/src/CFCClass.h Sat Feb 26 03:32:25 2011
@@ -20,6 +20,7 @@
typedef struct CFCClass CFCClass;
struct CFCParcel;
struct CFCDocuComment;
+struct CFCVariable;
CFCClass*
CFCClass_new(struct CFCParcel *parcel, const char *exposure,
@@ -42,9 +43,26 @@ CFCClass_destroy(CFCClass *self);
void
CFCClass_add_child(CFCClass *self, CFCClass *child);
+void
+CFCClass_add_member_var(CFCClass *self, struct CFCVariable *var);
+
+void
+CFCClass_add_inert_var(CFCClass *self, struct CFCVariable *var);
+
+/** Pass down member vars to from parent to children.
+ */
+void
+CFCClass_bequeath_member_vars(CFCClass *self);
+
CFCClass**
CFCClass_children(CFCClass *self);
+struct CFCVariable**
+CFCClass_member_vars(CFCClass *self);
+
+struct CFCVariable**
+CFCClass_inert_vars(CFCClass *self);
+
const char*
CFCClass_get_cnick(CFCClass *self);