You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/06/07 18:10:20 UTC
[lucy-commits] [05/16] git commit: refs/heads/separate-clownfish-wip4 - Fix stupid
bug in CFCHierarchy.c
Fix stupid bug in CFCHierarchy.c
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/bec8de04
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/bec8de04
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/bec8de04
Branch: refs/heads/separate-clownfish-wip4
Commit: bec8de04332622054a4ef1dedbe3620276dec9b7
Parents: 2bcfb20
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Thu Jun 6 18:41:06 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Fri Jun 7 17:40:37 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/perl/t/501-include_dir.t | 6 ++++++
clownfish/compiler/src/CFCHierarchy.c | 2 +-
clownfish/compiler/src/CFCTestHierarchy.c | 4 ++++
3 files changed, 11 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/bec8de04/clownfish/compiler/perl/t/501-include_dir.t
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/t/501-include_dir.t b/clownfish/compiler/perl/t/501-include_dir.t
index 202a0ef..45e5060 100644
--- a/clownfish/compiler/perl/t/501-include_dir.t
+++ b/clownfish/compiler/perl/t/501-include_dir.t
@@ -69,6 +69,7 @@ my $file_clash = catdir(qw( t cfclash file ));
is( $num_included, 3, "included class count" );
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
# Two sources
@@ -95,6 +96,7 @@ my $file_clash = catdir(qw( t cfclash file ));
}
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
# Name clashes
@@ -110,6 +112,7 @@ my $file_clash = catdir(qw( t cfclash file ));
like( $@, qr/Conflict with existing class Animal::Dog/, "source/source class name clash" );
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
{
@@ -124,6 +127,7 @@ my $file_clash = catdir(qw( t cfclash file ));
like( $@, qr/File \Q$filename\E already registered/, "source/source filename clash" );
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
{
@@ -137,6 +141,7 @@ my $file_clash = catdir(qw( t cfclash file ));
like( $@, qr/Conflict with existing class Animal::Dog/, "source/include class name clash" );
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
{
@@ -151,6 +156,7 @@ my $file_clash = catdir(qw( t cfclash file ));
is( scalar @$classes, 3, "source/include filename clash" );
Clownfish::CFC::Model::Class->_clear_registry();
+ Clownfish::CFC::Model::Parcel->reap_singletons();
}
# Clean up.
http://git-wip-us.apache.org/repos/asf/lucy/blob/bec8de04/clownfish/compiler/src/CFCHierarchy.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCHierarchy.c b/clownfish/compiler/src/CFCHierarchy.c
index f5d40eb..e059546 100644
--- a/clownfish/compiler/src/CFCHierarchy.c
+++ b/clownfish/compiler/src/CFCHierarchy.c
@@ -194,7 +194,7 @@ CFCHierarchy_build(CFCHierarchy *self) {
for (size_t i = 0; self->sources[i] != NULL; i++) {
CFCUtil_walk(self->sources[i], S_parse_parcel_files, &context);
}
- context.is_included = false;
+ context.is_included = true;
for (size_t i = 0; self->includes[i] != NULL; i++) {
CFCUtil_walk(self->includes[i], S_parse_parcel_files, &context);
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/bec8de04/clownfish/compiler/src/CFCTestHierarchy.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCTestHierarchy.c b/clownfish/compiler/src/CFCTestHierarchy.c
index 3f46c78..7516146 100644
--- a/clownfish/compiler/src/CFCTestHierarchy.c
+++ b/clownfish/compiler/src/CFCTestHierarchy.c
@@ -32,6 +32,7 @@
#include "CFCClass.h"
#include "CFCFile.h"
#include "CFCHierarchy.h"
+#include "CFCParcel.h"
#include "CFCTest.h"
#include "CFCUtil.h"
@@ -156,6 +157,7 @@ S_run_basic_tests(CFCTest *test) {
CFCBase_decref((CFCBase*)hierarchy);
CFCClass_clear_registry();
+ CFCParcel_reap_singletons();
}
static void
@@ -194,6 +196,7 @@ S_run_include_tests(CFCTest *test) {
FREEMEM(classes);
CFCBase_decref((CFCBase*)hierarchy);
CFCClass_clear_registry();
+ CFCParcel_reap_singletons();
}
{
@@ -222,6 +225,7 @@ S_run_include_tests(CFCTest *test) {
FREEMEM(classes);
CFCBase_decref((CFCBase*)hierarchy);
CFCClass_clear_registry();
+ CFCParcel_reap_singletons();
}
rmdir(T_CFDEST_INCLUDE);