Repository: lucy-clownfish Updated Branches: refs/heads/markdown_v2 e7d70dd76 -> ef0455fd4
Fix fresh symbols changes Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/9fc463fb Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/9fc463fb Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/9fc463fb Branch: refs/heads/markdown_v2 Commit: 9fc463fb0bf15bb6fb80a59a6a70bcdac4e17d06 Parents: e7d70dd Author: Nick Wellnhofer <[email protected]> Authored: Wed Dec 24 15:16:00 2014 +0100 Committer: Nick Wellnhofer <[email protected]> Committed: Wed Dec 24 16:01:07 2014 +0100 ---------------------------------------------------------------------- compiler/perl/t/401-class.t | 6 +++--- compiler/perl/t/404-file.t | 2 +- compiler/src/CFCClass.c | 6 +++--- compiler/src/CFCClass.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/9fc463fb/compiler/perl/t/401-class.t ---------------------------------------------------------------------- diff --git a/compiler/perl/t/401-class.t b/compiler/perl/t/401-class.t index d680c85..79e5e46 100644 --- a/compiler/perl/t/401-class.t +++ b/compiler/perl/t/401-class.t @@ -178,7 +178,7 @@ my $class_content = 'public class Foo::Foodie nickname Foodie inherits Foo { int num; }'; my $class = $parser->parse($class_content); isa_ok( $class, "Clownfish::CFC::Model::Class", "class_declaration FooJr" ); -ok( ( scalar grep { $_->micro_sym eq 'num' } @{ $class->member_vars } ), +ok( ( scalar grep { $_->micro_sym eq 'num' } @{ $class->fresh_member_vars } ), "parsed member var" ); $class_content = q| @@ -217,9 +217,9 @@ ok( ( scalar grep { $_->micro_sym eq 'num_dogs' } @{ $class->inert_vars } ), "parsed inert var" ); ok( ( scalar grep { $_->micro_sym eq 'top_dog' } @{ $class->inert_vars } ), "parsed public inert var" ); -ok( ( scalar grep { $_->micro_sym eq 'mom' } @{ $class->member_vars } ), +ok( ( scalar grep { $_->micro_sym eq 'mom' } @{ $class->fresh_member_vars } ), "parsed member var" ); -ok( ( scalar grep { $_->micro_sym eq 'squishy' } @{ $class->member_vars } ), +ok( ( scalar grep { $_->micro_sym eq 'squishy' } @{ $class->fresh_member_vars } ), "parsed member var" ); ok( ( scalar grep { $_->micro_sym eq 'init' } @{ $class->functions } ), "parsed function" ); http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/9fc463fb/compiler/perl/t/404-file.t ---------------------------------------------------------------------- diff --git a/compiler/perl/t/404-file.t b/compiler/perl/t/404-file.t index eec082c..a26ff05 100644 --- a/compiler/perl/t/404-file.t +++ b/compiler/perl/t/404-file.t @@ -69,7 +69,7 @@ my $file_spec = Clownfish::CFC::Model::FileSpec->new( my $classes = $file->classes; is( scalar @$classes, 3, "classes() filters blocks" ); my $class = $classes->[0]; - my ( $foo, $bar ) = @{ $class->member_vars }; + my ( $foo, $bar ) = @{ $class->fresh_member_vars }; $foo->resolve_type; $bar->resolve_type; is( $foo->get_type->get_specifier, http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/9fc463fb/compiler/src/CFCClass.c ---------------------------------------------------------------------- diff --git a/compiler/src/CFCClass.c b/compiler/src/CFCClass.c index 71108f5..2184f57 100644 --- a/compiler/src/CFCClass.c +++ b/compiler/src/CFCClass.c @@ -138,11 +138,11 @@ CFCClass_do_create(CFCClass *self, struct CFCParcel *parcel, self->num_functions = 0; self->fresh_methods = (CFCMethod**)CALLOCATE(1, sizeof(CFCMethod*)); self->num_fresh_meths = 0; - self->methods = (CFCMethod**)CALLOCATE(1, sizeof(CFCMethod*)); + self->methods = NULL; self->num_methods = 0; self->fresh_vars = (CFCVariable**)CALLOCATE(1, sizeof(CFCVariable*)); self->num_fresh_vars = 0; - self->member_vars = (CFCVariable**)CALLOCATE(1, sizeof(CFCVariable*)); + self->member_vars = NULL; self->num_member_vars = 0; self->inert_vars = (CFCVariable**)CALLOCATE(1, sizeof(CFCVariable*)); self->num_inert_vars = 0; @@ -515,7 +515,7 @@ S_bequeath_member_vars(CFCClass *self) { memcpy(child->member_vars + self->num_member_vars, child->fresh_vars, child->num_fresh_vars * sizeof(CFCVariable*)); - for (size_t j = 0; child->member_vars[j] != NULL; j++) { + for (size_t j = 0; j < num_vars; j++) { CFCBase_incref((CFCBase*)child->member_vars[j]); } child->num_member_vars = num_vars; http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/9fc463fb/compiler/src/CFCClass.h ---------------------------------------------------------------------- diff --git a/compiler/src/CFCClass.h b/compiler/src/CFCClass.h index 5d0701c..b960134 100644 --- a/compiler/src/CFCClass.h +++ b/compiler/src/CFCClass.h @@ -164,7 +164,7 @@ struct CFCMethod** CFCClass_fresh_methods(CFCClass *self); /** Return an array of all member variables declared in this class. - * Must be freed by the caller. + * Must not be freed by the caller. */ struct CFCVariable** CFCClass_fresh_member_vars(CFCClass *self);
