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 2014/03/12 19:37:28 UTC

[lucy-commits] [1/5] git commit: Compile cfc with debug flags

Repository: lucy-clownfish
Updated Branches:
  refs/heads/explicit-dependencies 3e08f203a -> 66b58c369


Compile cfc with debug flags


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/d657dabb
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/d657dabb
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/d657dabb

Branch: refs/heads/explicit-dependencies
Commit: d657dabb9a64bd93be2b6e99908c17d82ff23aa8
Parents: 5c6a1f9
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Mar 12 16:39:45 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Mar 12 17:04:17 2014 +0100

----------------------------------------------------------------------
 compiler/common/charmonizer.c    | 1 +
 compiler/common/charmonizer.main | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d657dabb/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.c b/compiler/common/charmonizer.c
index eb666e5..2231d08 100644
--- a/compiler/common/charmonizer.c
+++ b/compiler/common/charmonizer.c
@@ -7134,6 +7134,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
     makefile_cflags = chaz_CC_new_cflags();
 
     chaz_CFlags_enable_optimization(makefile_cflags);
+    chaz_CFlags_enable_debugging(makefile_cflags);
     chaz_CFlags_add_include_dir(makefile_cflags, ".");
     chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
     chaz_CFlags_add_include_dir(makefile_cflags, src_dir);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/d657dabb/compiler/common/charmonizer.main
----------------------------------------------------------------------
diff --git a/compiler/common/charmonizer.main b/compiler/common/charmonizer.main
index 8bc0fc0..40eaeb8 100644
--- a/compiler/common/charmonizer.main
+++ b/compiler/common/charmonizer.main
@@ -136,6 +136,7 @@ S_write_makefile(struct chaz_CLIArgs *args) {
     makefile_cflags = chaz_CC_new_cflags();
 
     chaz_CFlags_enable_optimization(makefile_cflags);
+    chaz_CFlags_enable_debugging(makefile_cflags);
     chaz_CFlags_add_include_dir(makefile_cflags, ".");
     chaz_CFlags_add_include_dir(makefile_cflags, include_dir);
     chaz_CFlags_add_include_dir(makefile_cflags, src_dir);


[lucy-commits] [2/5] git commit: Add prereqs to parcel definitions

Posted by nw...@apache.org.
Add prereqs to parcel definitions


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/5c6a1f96
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/5c6a1f96
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/5c6a1f96

Branch: refs/heads/explicit-dependencies
Commit: 5c6a1f9608e6c21997cca03774c794f8de8e8472
Parents: 3e08f20
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Mar 12 16:38:55 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Mar 12 17:04:17 2014 +0100

----------------------------------------------------------------------
 compiler/c/t/cfext/AnimalExtension.cfp    | 5 ++++-
 compiler/perl/t/cfext/AnimalExtension.cfp | 5 ++++-
 runtime/core/TestClownfish.cfp            | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5c6a1f96/compiler/c/t/cfext/AnimalExtension.cfp
----------------------------------------------------------------------
diff --git a/compiler/c/t/cfext/AnimalExtension.cfp b/compiler/c/t/cfext/AnimalExtension.cfp
index 76f31d3..14b0176 100644
--- a/compiler/c/t/cfext/AnimalExtension.cfp
+++ b/compiler/c/t/cfext/AnimalExtension.cfp
@@ -1,5 +1,8 @@
 {
     "name": "AnimalExtension",
     "nickname": "AniExt",
-    "version": "v0.1.0"
+    "version": "v0.1.0",
+    "prereqs": {
+        "Animal": null
+    }
 }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5c6a1f96/compiler/perl/t/cfext/AnimalExtension.cfp
----------------------------------------------------------------------
diff --git a/compiler/perl/t/cfext/AnimalExtension.cfp b/compiler/perl/t/cfext/AnimalExtension.cfp
index 76f31d3..14b0176 100644
--- a/compiler/perl/t/cfext/AnimalExtension.cfp
+++ b/compiler/perl/t/cfext/AnimalExtension.cfp
@@ -1,5 +1,8 @@
 {
     "name": "AnimalExtension",
     "nickname": "AniExt",
-    "version": "v0.1.0"
+    "version": "v0.1.0",
+    "prereqs": {
+        "Animal": null
+    }
 }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/5c6a1f96/runtime/core/TestClownfish.cfp
----------------------------------------------------------------------
diff --git a/runtime/core/TestClownfish.cfp b/runtime/core/TestClownfish.cfp
index f1c9411..b26be70 100644
--- a/runtime/core/TestClownfish.cfp
+++ b/runtime/core/TestClownfish.cfp
@@ -1,5 +1,8 @@
 {
     "name": "TestClownfish",
     "nickname": "TestCfish",
-    "version": "v0.3.0"
+    "version": "v0.3.0",
+    "prereqs": {
+        "Clownfish": "v0.3.0"
+    }
 }


[lucy-commits] [4/5] git commit: Add array of class struct symbols to CFCParcel

Posted by nw...@apache.org.
Add array of class struct symbols to CFCParcel


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/f226ff01
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/f226ff01
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/f226ff01

Branch: refs/heads/explicit-dependencies
Commit: f226ff01e49fbb65ff6c9ff00d32b56887ff3959
Parents: a96f749
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Mar 12 15:54:56 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Mar 12 19:33:25 2014 +0100

----------------------------------------------------------------------
 compiler/src/CFCClass.c  |  2 ++
 compiler/src/CFCParcel.c | 20 ++++++++++++++++++++
 compiler/src/CFCParcel.h |  3 +++
 3 files changed, 25 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f226ff01/compiler/src/CFCClass.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCClass.c b/compiler/src/CFCClass.c
index 61a9d42..dfb3e6d 100644
--- a/compiler/src/CFCClass.c
+++ b/compiler/src/CFCClass.c
@@ -202,6 +202,8 @@ CFCClass_do_create(CFCClass *self, struct CFCParcel *parcel,
     // Store in registry.
     S_register(self);
 
+    CFCParcel_add_class_struct_sym(parcel, self->struct_sym);
+
     return self;
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f226ff01/compiler/src/CFCParcel.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.c b/compiler/src/CFCParcel.c
index 68b88dd..bf89c7c 100644
--- a/compiler/src/CFCParcel.c
+++ b/compiler/src/CFCParcel.c
@@ -47,6 +47,8 @@ struct CFCParcel {
     int is_required;
     char **inherited_parcels;
     size_t num_inherited_parcels;
+    char **class_struct_syms;
+    size_t num_class_struct_syms;
     CFCPrereq **prereqs;
     size_t num_prereqs;
 };
@@ -258,6 +260,8 @@ CFCParcel_init(CFCParcel *self, const char *name, const char *cnick,
     // Initialize arrays.
     self->inherited_parcels = (char**)CALLOCATE(1, sizeof(char*));
     self->num_inherited_parcels = 0;
+    self->class_struct_syms = (char**)CALLOCATE(1, sizeof(char*));
+    self->num_class_struct_syms = 0;
     self->prereqs = (CFCPrereq**)CALLOCATE(1, sizeof(CFCPrereq*));
     self->num_prereqs = 0;
 
@@ -400,6 +404,10 @@ CFCParcel_destroy(CFCParcel *self) {
         FREEMEM(prereq);
     }
     FREEMEM(self->prereqs);
+    for (size_t i = 0; self->class_struct_syms[i]; ++i) {
+        FREEMEM(self->class_struct_syms[i]);
+    }
+    FREEMEM(self->class_struct_syms);
     CFCBase_destroy((CFCBase*)self);
 }
 
@@ -571,6 +579,18 @@ CFCParcel_has_prereq(CFCParcel *self, CFCParcel *parcel) {
     return false;
 }
 
+void
+CFCParcel_add_class_struct_sym(CFCParcel *self, const char *struct_sym) {
+    size_t num_class_struct_syms = self->num_class_struct_syms + 1;
+    size_t size = (num_class_struct_syms + 1) * sizeof(char*);
+    char **class_struct_syms
+        = (char**)REALLOCATE(self->class_struct_syms, size);
+    class_struct_syms[num_class_struct_syms-1] = CFCUtil_strdup(struct_sym);
+    class_struct_syms[num_class_struct_syms]   = NULL;
+    self->class_struct_syms     = class_struct_syms;
+    self->num_class_struct_syms = num_class_struct_syms;
+}
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self) {
     return self->name;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/f226ff01/compiler/src/CFCParcel.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.h b/compiler/src/CFCParcel.h
index 73bfdc0..41687e7 100644
--- a/compiler/src/CFCParcel.h
+++ b/compiler/src/CFCParcel.h
@@ -161,6 +161,9 @@ CFCParcel_check_prereqs(CFCParcel *self);
 int
 CFCParcel_has_prereq(CFCParcel *self, CFCParcel *parcel);
 
+void
+CFCParcel_add_class_struct_sym(CFCParcel *self, const char *struct_sym);
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self);
 


[lucy-commits] [5/5] git commit: Only search prerequisites for unqualified type specifiers

Posted by nw...@apache.org.
Only search prerequisites for unqualified type specifiers

Don't search all classes but only direct prerequisite parcels for
unqualified type specifiers. This avoids potential errors that could
arise from name clashes with classes from unrelated parcels.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/66b58c36
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/66b58c36
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/66b58c36

Branch: refs/heads/explicit-dependencies
Commit: 66b58c36993ca381eaadb2a9e4c89a93e3cfcf9f
Parents: f226ff0
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Mar 12 17:47:33 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Mar 12 19:33:36 2014 +0100

----------------------------------------------------------------------
 compiler/perl/lib/Clownfish/CFC.xs | 54 ++++++++-------------------------
 compiler/perl/t/105-object_type.t  | 39 ++++++++++++++++++------
 compiler/perl/t/300-variable.t     |  6 ++--
 compiler/perl/t/301-param_list.t   |  4 +--
 compiler/perl/t/404-file.t         |  4 +--
 compiler/perl/t/600-parser.t       |  4 +--
 compiler/src/CFCClass.c            | 10 +++---
 compiler/src/CFCClass.h            |  2 +-
 compiler/src/CFCFunction.c         |  6 ++--
 compiler/src/CFCFunction.h         |  2 +-
 compiler/src/CFCHierarchy.c        |  2 +-
 compiler/src/CFCMethod.c           |  4 +--
 compiler/src/CFCMethod.h           |  2 +-
 compiler/src/CFCParamList.c        |  4 +--
 compiler/src/CFCParamList.h        |  2 +-
 compiler/src/CFCParcel.c           | 32 +++++++++++++++++++
 compiler/src/CFCParcel.h           |  6 ++++
 compiler/src/CFCTestClass.c        | 10 +++---
 compiler/src/CFCTestFile.c         |  4 +--
 compiler/src/CFCTestMethod.c       |  3 +-
 compiler/src/CFCTestParamList.c    |  7 ++---
 compiler/src/CFCTestParser.c       |  2 +-
 compiler/src/CFCTestType.c         | 28 +++++++++--------
 compiler/src/CFCTestVariable.c     |  7 ++---
 compiler/src/CFCType.c             | 24 ++++-----------
 compiler/src/CFCType.h             |  2 +-
 compiler/src/CFCVariable.c         |  4 +--
 compiler/src/CFCVariable.h         |  2 +-
 28 files changed, 145 insertions(+), 131 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/lib/Clownfish/CFC.xs
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC.xs b/compiler/perl/lib/Clownfish/CFC.xs
index faa74f3..f69dfc4 100644
--- a/compiler/perl/lib/Clownfish/CFC.xs
+++ b/compiler/perl/lib/Clownfish/CFC.xs
@@ -268,15 +268,10 @@ CODE:
 OUTPUT: RETVAL
 
 void
-resolve_types(self, classes_sv)
+resolve_types(self)
     CFCClass *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCClass_resolve_types(self, classes);
-    FREEMEM(classes);
+    CFCClass_resolve_types(self);
 
 void
 _set_or_get(self, ...)
@@ -662,15 +657,10 @@ CODE:
 OUTPUT: RETVAL
 
 void
-resolve_types(self, classes_sv)
+resolve_types(self)
     CFCFunction *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCFunction_resolve_types(self, classes);
-    FREEMEM(classes);
+    CFCFunction_resolve_types(self);
 
 void
 _set_or_get(self, ...)
@@ -866,15 +856,10 @@ CODE:
 OUTPUT: RETVAL
 
 void
-resolve_types(self, classes_sv)
+resolve_types(self)
     CFCMethod *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCMethod_resolve_types(self, classes);
-    FREEMEM(classes);
+    CFCMethod_resolve_types(self);
 
 void
 exclude_from_host(self)
@@ -996,15 +981,10 @@ PPCODE:
     CFCParamList_add_param(self, variable, value);
 
 void
-resolve_types(self, classes_sv)
+resolve_types(self)
     CFCParamList *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCParamList_resolve_types(self, classes);
-    FREEMEM(classes);
+    CFCParamList_resolve_types(self);
 
 void
 _set_or_get(self, ...)
@@ -1550,15 +1530,10 @@ CODE:
 OUTPUT: RETVAL
 
 void
-resolve(self, classes_sv)
+resolve(self)
     CFCType *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCType_resolve(self, classes);
-    FREEMEM(classes);
+    CFCType_resolve(self);
 
 void
 _set_or_get(self, ...)
@@ -1772,15 +1747,10 @@ CODE:
 OUTPUT: RETVAL
 
 void
-resolve_type(self, classes_sv)
+resolve_type(self)
     CFCVariable *self;
-    SV *classes_sv;
 PPCODE:
-    CFCClass **classes
-        = (CFCClass**)S_av_to_array_of_cfcbase(classes_sv,
-                                               "Clownfish::CFC::Model::Class");
-    CFCVariable_resolve_type(self, classes);
-    FREEMEM(classes);
+    CFCVariable_resolve_type(self);
 
 void
 _set_or_get(self, ...)

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/t/105-object_type.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/105-object_type.t b/compiler/perl/t/105-object_type.t
index 6bf4c65..9bdce59 100644
--- a/compiler/perl/t/105-object_type.t
+++ b/compiler/perl/t/105-object_type.t
@@ -38,11 +38,11 @@ for my $bad_specifier (qw( foo Foo_Bar FOOBAR 1Foo 1FOO )) {
 }
 
 my @specifiers = qw( Foo FooJr FooIII Foo4th );
-my @classes = map { $parser->parse("class $_ {}") } @specifiers;
+$parser->parse("class $_ {}") for @specifiers;
 
 for my $specifier (@specifiers) {
     my $type = $parser->parse("$specifier*");
-    $type->resolve(\@classes);
+    $type->resolve;
     is( $type->get_specifier, "neato_$specifier",
         "object_type_specifier: $specifier" );
     is( $parser->parse("neato_$specifier*")->get_specifier,
@@ -69,6 +69,7 @@ like( $@, qr/specifier/i, "specifier required" );
 for ( 0, 2 ) {
     eval {
         my $type = Clownfish::CFC::Model::Type->new_object(
+            parcel      => 'Neato',
             specifier   => 'Foo',
             indirection => $_,
         );
@@ -76,12 +77,27 @@ for ( 0, 2 ) {
     like( $@, qr/indirection/i, "invalid indirection of $_" );
 }
 
-my $foo_type = Clownfish::CFC::Model::Type->new_object( specifier => 'Foo' );
-my $another_foo
-    = Clownfish::CFC::Model::Type->new_object( specifier => 'Foo' );
+my $foo_type = Clownfish::CFC::Model::Type->new_object(
+    parcel    => 'Neato',
+    specifier => 'Foo',
+);
+$foo_type->resolve;
+my $another_foo = Clownfish::CFC::Model::Type->new_object(
+    parcel    => 'Neato',
+    specifier => 'Foo',
+);
+$another_foo->resolve;
 ok( $foo_type->equals($another_foo), "equals" );
 
-my $bar_type = Clownfish::CFC::Model::Type->new_object( specifier => 'Bar' );
+my $bar_class = Clownfish::CFC::Model::Class->create(
+    parcel     => 'Neato',
+    class_name => 'Bar',
+);
+my $bar_type = Clownfish::CFC::Model::Type->new_object(
+    parcel    => 'Neato',
+    specifier => 'Bar',
+);
+$bar_type->resolve;
 ok( !$foo_type->equals($bar_type), "different specifier spoils equals" );
 
 my $foreign_foo_class = Clownfish::CFC::Model::Class->create(
@@ -89,18 +105,20 @@ my $foreign_foo_class = Clownfish::CFC::Model::Class->create(
     class_name => 'Foreign::Foo',
 );
 my $foreign_foo = Clownfish::CFC::Model::Type->new_object(
-    specifier => 'Foo',
     parcel    => 'Foreign',
+    specifier => 'Foo',
 );
-$foreign_foo->resolve([ $foreign_foo_class ]);
+$foreign_foo->resolve;
 ok( !$foo_type->equals($foreign_foo), "different parcel spoils equals" );
 is( $foreign_foo->get_specifier, "foreign_Foo",
     "prepend parcel prefix to specifier" );
 
 my $incremented_foo = Clownfish::CFC::Model::Type->new_object(
+    parcel      => 'Neato',
     specifier   => 'Foo',
     incremented => 1,
 );
+$incremented_foo->resolve;
 ok( $incremented_foo->incremented, "incremented" );
 ok( !$foo_type->incremented,       "not incremented" );
 ok( !$foo_type->equals($incremented_foo),
@@ -108,9 +126,11 @@ ok( !$foo_type->equals($incremented_foo),
 );
 
 my $decremented_foo = Clownfish::CFC::Model::Type->new_object(
+    parcel      => 'Neato',
     specifier   => 'Foo',
     decremented => 1,
 );
+$decremented_foo->resolve;
 ok( $decremented_foo->decremented, "decremented" );
 ok( !$foo_type->decremented,       "not decremented" );
 ok( !$foo_type->equals($decremented_foo),
@@ -118,10 +138,11 @@ ok( !$foo_type->equals($decremented_foo),
 );
 
 my $const_foo = Clownfish::CFC::Model::Type->new_object(
+    parcel    => 'Neato',
     specifier => 'Foo',
     const     => 1,
 );
-$const_foo->resolve(\@classes);
+$const_foo->resolve;
 ok( !$foo_type->equals($const_foo), "different const spoils equals" );
 like( $const_foo->to_c, qr/const/, "const included in C representation" );
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/t/300-variable.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/300-variable.t b/compiler/perl/t/300-variable.t
index a5f33be..bc49d17 100644
--- a/compiler/perl/t/300-variable.t
+++ b/compiler/perl/t/300-variable.t
@@ -49,7 +49,7 @@ my $var = Clownfish::CFC::Model::Variable->new(
     micro_sym => 'foo',
     type      => new_type('float*')
 );
-$var->resolve_type([]);
+$var->resolve_type;
 is( $var->local_c,           'float* foo',  "local_c" );
 is( $var->local_declaration, 'float* foo;', "declaration" );
 ok( $var->local, "default to local access" );
@@ -58,7 +58,7 @@ $var = Clownfish::CFC::Model::Variable->new(
     micro_sym => 'foo',
     type      => new_type('float[1]')
 );
-$var->resolve_type([]);
+$var->resolve_type;
 is( $var->local_c, 'float foo[1]',
     "to_c appends array to var name rather than type specifier" );
 
@@ -70,7 +70,7 @@ $var = Clownfish::CFC::Model::Variable->new(
     class_name  => 'Crustacean::Lobster::LobsterClaw',
     class_cnick => 'LobClaw',
 );
-$var->resolve_type([ $foo_class ]);
+$var->resolve_type;
 is( $var->global_c, 'neato_Foo* neato_LobClaw_foo', "global_c" );
 
 isa_ok(

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/t/301-param_list.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/301-param_list.t b/compiler/perl/t/301-param_list.t
index b315e9a..b3665c8 100644
--- a/compiler/perl/t/301-param_list.t
+++ b/compiler/perl/t/301-param_list.t
@@ -33,14 +33,14 @@ isa_ok(
 my $obj_class = $parser->parse("class Obj {}");
 
 my $param_list = $parser->parse("(Obj *self, int num)");
-$param_list->resolve_types([ $obj_class ]);
+$param_list->resolve_types;
 isa_ok( $param_list, "Clownfish::CFC::Model::ParamList" );
 ok( !$param_list->variadic, "not variadic" );
 is( $param_list->to_c, 'neato_Obj* self, int num', "to_c" );
 is( $param_list->name_list, 'self, num', "name_list" );
 
 $param_list = $parser->parse("(Obj *self=NULL, int num, ...)");
-$param_list->resolve_types([ $obj_class ]);
+$param_list->resolve_types;
 ok( $param_list->variadic, "variadic" );
 is_deeply(
     $param_list->get_initial_values,

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/t/404-file.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/404-file.t b/compiler/perl/t/404-file.t
index 11668c4..d071c66 100644
--- a/compiler/perl/t/404-file.t
+++ b/compiler/perl/t/404-file.t
@@ -70,8 +70,8 @@ my $file_spec = Clownfish::CFC::Model::FileSpec->new(
     is( scalar @$classes, 3, "classes() filters blocks" );
     my $class = $classes->[0];
     my ( $foo, $bar ) = @{ $class->member_vars };
-    $foo->resolve_type($classes);
-    $bar->resolve_type($classes);
+    $foo->resolve_type;
+    $bar->resolve_type;
     is( $foo->get_type->get_specifier,
         'stuff_Foo', 'file production picked up parcel def' );
     is( $bar->get_type->get_specifier, 'stuff_Bar', 'parcel def is sticky' );

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/perl/t/600-parser.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/600-parser.t b/compiler/perl/t/600-parser.t
index 94dbed3..8d6e26e 100644
--- a/compiler/perl/t/600-parser.t
+++ b/compiler/perl/t/600-parser.t
@@ -57,7 +57,7 @@ isa_ok( $parser->parse("bool"),
 for (qw( ByteBuf Obj ANDMatcher )) {
     my $class = $parser->parse("class $_ {}");
     my $type  = $parser->parse("$_*");
-    $type->resolve([ $class ]);
+    $type->resolve;
     is( $type->get_specifier, "crust_$_", "object_type_specifier $_" );
 }
 
@@ -134,7 +134,7 @@ ok( $parser->parse($_), "declaration statement: $_" )
 for (qw( Foo FooJr FooIII Foo4th )) {
     my $class = $parser->parse("class $_ {}");
     my $type  = $parser->parse("$_*");
-    $type->resolve([ $class ]);
+    $type->resolve;
     is( $type->get_specifier, "crust_$_", "object_type_specifier: $_" )
 }
 Clownfish::CFC::Model::Class->_clear_registry();

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCClass.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCClass.c b/compiler/src/CFCClass.c
index dfb3e6d..b928f1a 100644
--- a/compiler/src/CFCClass.c
+++ b/compiler/src/CFCClass.c
@@ -480,18 +480,18 @@ CFCClass_fresh_method(CFCClass *self, const char *sym) {
 }
 
 void
-CFCClass_resolve_types(CFCClass *self, CFCClass **classes) {
+CFCClass_resolve_types(CFCClass *self) {
     for (size_t i = 0; self->functions[i] != NULL; i++) {
-        CFCFunction_resolve_types(self->functions[i], classes);
+        CFCFunction_resolve_types(self->functions[i]);
     }
     for (size_t i = 0; self->methods[i] != NULL; i++) {
-        CFCMethod_resolve_types(self->methods[i], classes);
+        CFCMethod_resolve_types(self->methods[i]);
     }
     for (size_t i = 0; self->member_vars[i] != NULL; i++) {
-        CFCVariable_resolve_type(self->member_vars[i], classes);
+        CFCVariable_resolve_type(self->member_vars[i]);
     }
     for (size_t i = 0; self->inert_vars[i] != NULL; i++) {
-        CFCVariable_resolve_type(self->inert_vars[i], classes);
+        CFCVariable_resolve_type(self->inert_vars[i]);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCClass.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCClass.h b/compiler/src/CFCClass.h
index 5c52728..00e05a3 100644
--- a/compiler/src/CFCClass.h
+++ b/compiler/src/CFCClass.h
@@ -142,7 +142,7 @@ CFCClass_find_novel_method(CFCClass *self, const char *sym);
 /** Find the actual class of all object variables without prefix.
  */
 void
-CFCClass_resolve_types(CFCClass *self, CFCClass **classes);
+CFCClass_resolve_types(CFCClass *self);
 
 /** Bequeath all inherited methods and members to children.
  */

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCFunction.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCFunction.c b/compiler/src/CFCFunction.c
index 6f781f4..3926164 100644
--- a/compiler/src/CFCFunction.c
+++ b/compiler/src/CFCFunction.c
@@ -84,9 +84,9 @@ CFCFunction_init(CFCFunction *self, CFCParcel *parcel, const char *exposure,
 }
 
 void
-CFCFunction_resolve_types(CFCFunction *self, struct CFCClass **classes) {
-    CFCType_resolve(self->return_type, classes);
-    CFCParamList_resolve_types(self->param_list, classes);
+CFCFunction_resolve_types(CFCFunction *self) {
+    CFCType_resolve(self->return_type);
+    CFCParamList_resolve_types(self->param_list);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCFunction.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCFunction.h b/compiler/src/CFCFunction.h
index baab2c7..16a789e 100644
--- a/compiler/src/CFCFunction.h
+++ b/compiler/src/CFCFunction.h
@@ -114,7 +114,7 @@ CFCFunction_public(CFCFunction *self);
 /** Find the actual class of all object variables without prefix.
  */
 void
-CFCFunction_resolve_types(CFCFunction *self, struct CFCClass **classes);
+CFCFunction_resolve_types(CFCFunction *self);
 
 #ifdef __cplusplus
 }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCHierarchy.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCHierarchy.c b/compiler/src/CFCHierarchy.c
index af03016..f7e9520 100644
--- a/compiler/src/CFCHierarchy.c
+++ b/compiler/src/CFCHierarchy.c
@@ -214,7 +214,7 @@ CFCHierarchy_build(CFCHierarchy *self) {
     }
 
     for (int i = 0; self->classes[i] != NULL; i++) {
-        CFCClass_resolve_types(self->classes[i], self->classes);
+        CFCClass_resolve_types(self->classes[i]);
     }
 
     S_connect_classes(self);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCMethod.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCMethod.c b/compiler/src/CFCMethod.c
index f5780e2..97c68ae 100644
--- a/compiler/src/CFCMethod.c
+++ b/compiler/src/CFCMethod.c
@@ -149,8 +149,8 @@ CFCMethod_init(CFCMethod *self, CFCParcel *parcel, const char *exposure,
 }
 
 void
-CFCMethod_resolve_types(CFCMethod *self, struct CFCClass **classes) {
-    CFCFunction_resolve_types((CFCFunction*)self, classes);
+CFCMethod_resolve_types(CFCMethod *self) {
+    CFCFunction_resolve_types((CFCFunction*)self);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCMethod.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCMethod.h b/compiler/src/CFCMethod.h
index 0c96220..ad3294c 100644
--- a/compiler/src/CFCMethod.h
+++ b/compiler/src/CFCMethod.h
@@ -71,7 +71,7 @@ CFCMethod_init(CFCMethod *self, struct CFCParcel *parcel,
                int is_abstract);
 
 void
-CFCMethod_resolve_types(CFCMethod *self, struct CFCClass **classes);
+CFCMethod_resolve_types(CFCMethod *self);
 
 void
 CFCMethod_destroy(CFCMethod *self);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCParamList.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParamList.c b/compiler/src/CFCParamList.c
index 087030c..06b5e0e 100644
--- a/compiler/src/CFCParamList.c
+++ b/compiler/src/CFCParamList.c
@@ -61,9 +61,9 @@ CFCParamList_init(CFCParamList *self, int variadic) {
 }
 
 void
-CFCParamList_resolve_types(CFCParamList *self, struct CFCClass **classes) {
+CFCParamList_resolve_types(CFCParamList *self) {
     for (size_t i = 0; self->variables[i]; ++i) {
-        CFCVariable_resolve_type(self->variables[i], classes);
+        CFCVariable_resolve_type(self->variables[i]);
     }
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCParamList.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParamList.h b/compiler/src/CFCParamList.h
index 886fdfe..2aaae6d 100644
--- a/compiler/src/CFCParamList.h
+++ b/compiler/src/CFCParamList.h
@@ -38,7 +38,7 @@ CFCParamList*
 CFCParamList_init(CFCParamList *self, int variadic);
 
 void
-CFCParamList_resolve_types(CFCParamList *self, struct CFCClass **classes);
+CFCParamList_resolve_types(CFCParamList *self);
 
 void
 CFCParamList_destroy(CFCParamList *self);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCParcel.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.c b/compiler/src/CFCParcel.c
index bf89c7c..ae0f272 100644
--- a/compiler/src/CFCParcel.c
+++ b/compiler/src/CFCParcel.c
@@ -591,6 +591,38 @@ CFCParcel_add_class_struct_sym(CFCParcel *self, const char *struct_sym) {
     self->num_class_struct_syms = num_class_struct_syms;
 }
 
+static CFCParcel*
+S_lookup_struct_sym(CFCParcel *self, const char *struct_sym) {
+    for (size_t i = 0; self->class_struct_syms[i]; ++i) {
+        if (strcmp(self->class_struct_syms[i], struct_sym) == 0) {
+            return self;
+        }
+    }
+
+    return NULL;
+}
+
+CFCParcel*
+CFCParcel_lookup_struct_sym(CFCParcel *self, const char *struct_sym) {
+    CFCParcel *parcel = S_lookup_struct_sym(self, struct_sym);
+
+    for (size_t i = 0; self->prereqs[i]; ++i) {
+        const char *prereq_name   = CFCPrereq_get_name(self->prereqs[i]);
+        CFCParcel  *prereq_parcel = CFCParcel_fetch(prereq_name);
+        CFCParcel *maybe_parcel
+            = S_lookup_struct_sym(prereq_parcel, struct_sym);
+
+        if (maybe_parcel) {
+            if (parcel) {
+                CFCUtil_die("Type '%s' is ambigious", struct_sym);
+            }
+            parcel = maybe_parcel;
+        }
+    }
+
+    return parcel;
+}
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self) {
     return self->name;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCParcel.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.h b/compiler/src/CFCParcel.h
index 41687e7..d1838e6 100644
--- a/compiler/src/CFCParcel.h
+++ b/compiler/src/CFCParcel.h
@@ -164,6 +164,12 @@ CFCParcel_has_prereq(CFCParcel *self, CFCParcel *parcel);
 void
 CFCParcel_add_class_struct_sym(CFCParcel *self, const char *struct_sym);
 
+/** Search the parcel and all direct prerequisites for a class with
+ * struct_sym. Return the parcel in which the class was found or NULL.
+ */
+CFCParcel*
+CFCParcel_lookup_struct_sym(CFCParcel *self, const char *struct_sym);
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self);
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestClass.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestClass.c b/compiler/src/CFCTestClass.c
index e33d454..aa080ae 100644
--- a/compiler/src/CFCTestClass.c
+++ b/compiler/src/CFCTestClass.c
@@ -120,17 +120,15 @@ S_run_tests(CFCTest *test) {
         CFCBase_decref((CFCBase*)parsed_neato);
     }
 
+    CFCParser_set_parcel(parser, neato);
     CFCParser_set_class_name(parser, "Foo");
     CFCMethod *do_stuff
         = CFCTest_parse_method(test, parser, "void Do_Stuff(Foo *self);");
     CFCClass_add_method(foo, do_stuff);
 
-    CFCClass *class_list[6] = {
-        foo, foo_jr, final_foo, thing_class, widget_class, NULL
-    };
-    CFCClass_resolve_types(foo, class_list);
-    CFCClass_resolve_types(foo_jr, class_list);
-    CFCClass_resolve_types(final_foo, class_list);
+    CFCClass_resolve_types(foo);
+    CFCClass_resolve_types(foo_jr);
+    CFCClass_resolve_types(final_foo);
 
     CFCClass_add_child(foo, foo_jr);
     CFCClass_add_child(foo_jr, final_foo);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestFile.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestFile.c b/compiler/src/CFCTestFile.c
index ad1cd5c..44e6f1c 100644
--- a/compiler/src/CFCTestFile.c
+++ b/compiler/src/CFCTestFile.c
@@ -97,11 +97,11 @@ S_run_tests(CFCTest *test) {
            "classes() filters blocks");
         CFCVariable **member_vars = CFCClass_member_vars(classes[0]);
         CFCType *foo_type = CFCVariable_get_type(member_vars[0]);
-        CFCType_resolve(foo_type, classes);
+        CFCType_resolve(foo_type);
         STR_EQ(test, CFCType_get_specifier(foo_type), "stuff_Foo",
                "file production picked up parcel def");
         CFCType *bar_type = CFCVariable_get_type(member_vars[1]);
-        CFCType_resolve(bar_type, classes);
+        CFCType_resolve(bar_type);
         STR_EQ(test, CFCType_get_specifier(bar_type), "stuff_Bar",
                "parcel def is sticky");
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestMethod.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestMethod.c b/compiler/src/CFCTestMethod.c
index cde5d7e..39dd8d3 100644
--- a/compiler/src/CFCTestMethod.c
+++ b/compiler/src/CFCTestMethod.c
@@ -255,7 +255,6 @@ S_run_final_tests(CFCTest *test) {
         = CFCTest_parse_class(test, parser, "class Obj {}");
     CFCClass *foo_class
         = CFCTest_parse_class(test, parser, "class Neato::Foo {}");
-    CFCClass *class_list[3] = { obj_class, foo_class, NULL };
     CFCType *return_type = CFCTest_parse_type(test, parser, "Obj*");
     CFCParamList *param_list
         = CFCTest_parse_param_list(test, parser, "(Foo *self)");
@@ -264,7 +263,7 @@ S_run_final_tests(CFCTest *test) {
         = CFCMethod_new(neato_parcel, NULL, "Neato::Foo", "Foo",
                         "Return_An_Obj", return_type, param_list,
                         NULL, 0, 0);
-    CFCMethod_resolve_types(not_final, class_list);
+    CFCMethod_resolve_types(not_final);
     CFCMethod *final = CFCMethod_finalize(not_final);
     OK(test, CFCMethod_compatible(not_final, final),
        "finalize clones properly");

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestParamList.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestParamList.c b/compiler/src/CFCTestParamList.c
index 29ff226..9dab0b8 100644
--- a/compiler/src/CFCTestParamList.c
+++ b/compiler/src/CFCTestParamList.c
@@ -38,12 +38,11 @@ S_run_tests(CFCTest *test) {
     CFCParcel *neato_parcel
         = CFCTest_parse_parcel(test, parser, "parcel Neato;");
     CFCClass *obj_class = CFCTest_parse_class(test, parser, "class Obj {}");
-    CFCClass *class_list[2] = { obj_class, NULL };
 
     {
         CFCParamList *param_list
             = CFCTest_parse_param_list(test, parser, "(Obj *self, int num)");
-        CFCParamList_resolve_types(param_list, class_list);
+        CFCParamList_resolve_types(param_list);
         OK(test, !CFCParamList_variadic(param_list), "not variadic");
         STR_EQ(test, CFCParamList_to_c(param_list), "neato_Obj* self, int num",
                "to_c");
@@ -57,7 +56,7 @@ S_run_tests(CFCTest *test) {
         CFCParamList *param_list
             = CFCTest_parse_param_list(test, parser,
                                        "(Obj *self=NULL, int num, ...)");
-        CFCParamList_resolve_types(param_list, class_list);
+        CFCParamList_resolve_types(param_list);
         OK(test, CFCParamList_variadic(param_list), "variadic");
         STR_EQ(test, CFCParamList_to_c(param_list),
                "neato_Obj* self, int num, ...", "to_c");
@@ -77,7 +76,7 @@ S_run_tests(CFCTest *test) {
     {
         CFCParamList *param_list
             = CFCTest_parse_param_list(test, parser, "()");
-        CFCParamList_resolve_types(param_list, class_list);
+        CFCParamList_resolve_types(param_list);
         STR_EQ(test, CFCParamList_to_c(param_list), "void", "to_c");
         INT_EQ(test, CFCParamList_num_vars(param_list), 0, "num_vars");
         CFCVariable **variables = CFCParamList_get_variables(param_list);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestParser.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestParser.c b/compiler/src/CFCTestParser.c
index 556a135..f377baa 100644
--- a/compiler/src/CFCTestParser.c
+++ b/compiler/src/CFCTestParser.c
@@ -127,7 +127,7 @@ S_run_tests(CFCTest *test) {
             char *src      = CFCUtil_sprintf("%s*", class_name);
             char *expected = CFCUtil_sprintf("crust_%s", class_name);
             CFCType *type = CFCTest_parse_type(test, parser, src);
-            CFCType_resolve(type, class_list);
+            CFCType_resolve(type);
             STR_EQ(test, CFCType_get_specifier(type), expected,
                    "object_type_specifier: %s", class_name);
             FREEMEM(src);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestType.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestType.c b/compiler/src/CFCTestType.c
index f452767..693613f 100644
--- a/compiler/src/CFCTestType.c
+++ b/compiler/src/CFCTestType.c
@@ -290,7 +290,6 @@ S_run_object_tests(CFCTest *test) {
 
             char *class_code = CFCUtil_sprintf("class %s {}", specifier);
             CFCClass *klass = CFCTest_parse_class(test, parser, class_code);
-            CFCClass *class_list[2] = { klass, NULL };
             FREEMEM(class_code);
 
             static const char *prefixes[2] = { "", "neato_" };
@@ -298,7 +297,7 @@ S_run_object_tests(CFCTest *test) {
             for (int j = 0; j < 2; ++j) {
                 char *src = CFCUtil_sprintf("%s%s*", prefixes[j], specifier);
                 CFCType *type = CFCTest_parse_type(test, parser, src);
-                CFCType_resolve(type, class_list);
+                CFCType_resolve(type);
                 STR_EQ(test, CFCType_get_specifier(type), expect,
                        "object_type_specifier: %s", src);
                 OK(test, CFCType_is_object(type), "%s is_object", src);
@@ -332,22 +331,26 @@ S_run_object_tests(CFCTest *test) {
     CFCClass *foo_class
         = CFCClass_create(neato_parcel, NULL, "Foo", NULL, NULL, NULL, NULL,
                           NULL, false, false);
-    CFCClass *class_list[2] = { foo_class, NULL };
-    CFCType *foo = CFCType_new_object(0, NULL, "Foo", 1);
-    CFCType_resolve(foo, class_list);
+    CFCType *foo = CFCType_new_object(0, neato_parcel, "Foo", 1);
+    CFCType_resolve(foo);
 
     {
-        CFCType *another_foo = CFCType_new_object(0, NULL, "Foo", 1);
-        CFCType_resolve(another_foo, class_list);
+        CFCType *another_foo = CFCType_new_object(0, neato_parcel, "Foo", 1);
+        CFCType_resolve(another_foo);
         OK(test, CFCType_equals(foo, another_foo), "equals");
         CFCBase_decref((CFCBase*)another_foo);
     }
 
     {
-        CFCType *bar = CFCType_new_object(0, NULL, "Bar", 1);
+        CFCClass *bar_class
+            = CFCClass_create(neato_parcel, NULL, "Bar", NULL, NULL, NULL,
+                              NULL, NULL, false, false);
+        CFCType *bar = CFCType_new_object(0, neato_parcel, "Bar", 1);
+        CFCType_resolve(bar);
         OK(test, !CFCType_equals(foo, bar),
            "different specifier spoils equals");
         CFCBase_decref((CFCBase*)bar);
+        CFCBase_decref((CFCBase*)bar_class);
     }
 
     {
@@ -356,9 +359,8 @@ S_run_object_tests(CFCTest *test) {
         CFCClass *foreign_foo_class
             = CFCClass_create(foreign_parcel, NULL, "Foreign::Foo", NULL, NULL,
                               NULL, NULL, NULL, false, false);
-        CFCClass *foreign_class_list[2] = { foreign_foo_class, NULL };
         CFCType *foreign_foo = CFCType_new_object(0, foreign_parcel, "Foo", 1);
-        CFCType_resolve(foreign_foo, foreign_class_list);
+        CFCType_resolve(foreign_foo);
         OK(test, !CFCType_equals(foo, foreign_foo),
            "different parcel spoils equals");
         STR_EQ(test, CFCType_get_specifier(foreign_foo), "foreign_Foo",
@@ -371,7 +373,8 @@ S_run_object_tests(CFCTest *test) {
     {
         for (int i = 0; i < 4; ++i) {
             CFCType *modified_foo
-                = CFCType_new_object(flags[i], NULL, "Foo", 1);
+                = CFCType_new_object(flags[i], neato_parcel, "Foo", 1);
+            CFCType_resolve(modified_foo);
             OK(test, accessors[i](modified_foo), "%s", modifiers[i]);
             OK(test, !accessors[i](foo), "not %s", modifiers[i]);
             OK(test, !CFCType_equals(foo, modified_foo),
@@ -511,9 +514,8 @@ S_run_composite_tests(CFCTest *test) {
     }
 
     {
-        CFCClass *class_list[1] = { NULL };
         CFCType *foo_array = CFCTest_parse_type(test, parser, "foo_t[]");
-        CFCType_resolve(foo_array, class_list);
+        CFCType_resolve(foo_array);
         STR_EQ(test, CFCType_get_array(foo_array), "[]", "get_array");
         STR_EQ(test, CFCType_to_c(foo_array), "foo_t",
                "array subscripts not included by to_c");

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCTestVariable.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCTestVariable.c b/compiler/src/CFCTestVariable.c
index e8096e7..022db0b 100644
--- a/compiler/src/CFCTestVariable.c
+++ b/compiler/src/CFCTestVariable.c
@@ -39,13 +39,12 @@ S_run_tests(CFCTest *test) {
     CFCParcel *neato_parcel
         = CFCTest_parse_parcel(test, parser, "parcel Neato;");
     CFCClass *foo_class = CFCTest_parse_class(test, parser, "class Foo {}");
-    CFCClass *class_list[2] = { foo_class, NULL };
 
     {
         CFCType *type = CFCTest_parse_type(test, parser, "float*");
         CFCVariable *var
             = CFCVariable_new(NULL, NULL, NULL, NULL, "foo", type, 0);
-        CFCVariable_resolve_type(var, class_list);
+        CFCVariable_resolve_type(var);
         STR_EQ(test, CFCVariable_local_c(var), "float* foo", "local_c");
         STR_EQ(test, CFCVariable_local_declaration(var), "float* foo;",
                "local_declaration");
@@ -59,7 +58,7 @@ S_run_tests(CFCTest *test) {
         CFCType *type = CFCTest_parse_type(test, parser, "float[1]");
         CFCVariable *var
             = CFCVariable_new(NULL, NULL, NULL, NULL, "foo", type, 0);
-        CFCVariable_resolve_type(var, class_list);
+        CFCVariable_resolve_type(var);
         STR_EQ(test, CFCVariable_local_c(var), "float foo[1]",
                "to_c appends array to var name rather than type specifier");
 
@@ -73,7 +72,7 @@ S_run_tests(CFCTest *test) {
             = CFCVariable_new(neato_parcel, NULL,
                               "Crustacean::Lobster::LobsterClaw", "LobClaw",
                               "foo", type, 0);
-        CFCVariable_resolve_type(var, class_list);
+        CFCVariable_resolve_type(var);
         STR_EQ(test, CFCVariable_global_c(var), "neato_Foo* neato_LobClaw_foo",
                "global_c");
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCType.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCType.c b/compiler/src/CFCType.c
index 3ff7db7..8a3d774 100644
--- a/compiler/src/CFCType.c
+++ b/compiler/src/CFCType.c
@@ -262,9 +262,9 @@ CFCType_new_arbitrary(CFCParcel *parcel, const char *specifier) {
 }
 
 void
-CFCType_resolve(CFCType *self, CFCClass **classes) {
+CFCType_resolve(CFCType *self) {
     if (CFCType_is_composite(self)) {
-        CFCType_resolve(self->child, classes);
+        CFCType_resolve(self->child);
         return;
     }
     if (!CFCType_is_object(self)) {
@@ -273,26 +273,14 @@ CFCType_resolve(CFCType *self, CFCClass **classes) {
 
     char *specifier = self->specifier;
     if (isupper(specifier[0])) {
-        // Try to find class from class list.
-        CFCClass *klass = NULL;
-        for (size_t i = 0; classes[i]; ++i) {
-            CFCClass   *maybe_class = classes[i];
-            const char *struct_sym  = CFCClass_get_struct_sym(maybe_class);
-
-            if (strcmp(specifier, struct_sym) == 0) {
-                if (klass) {
-                    CFCUtil_die("Type '%s' is ambigious", specifier);
-                }
-                klass = maybe_class;
-            }
-        }
-
-        if (!klass) {
+        CFCParcel *parcel
+            = CFCParcel_lookup_struct_sym(self->parcel, specifier);
+        if (!parcel) {
             CFCUtil_die("No class found for type '%s'", specifier);
         }
 
         // Create actual specifier with prefix.
-        const char *prefix = CFCClass_get_prefix(klass);
+        const char *prefix = CFCParcel_get_prefix(parcel);
         self->specifier = CFCUtil_sprintf("%s%s", prefix, specifier);
         FREEMEM(specifier);
     }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCType.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCType.h b/compiler/src/CFCType.h
index fbf18e7..53916c1 100644
--- a/compiler/src/CFCType.h
+++ b/compiler/src/CFCType.h
@@ -176,7 +176,7 @@ CFCType_new_arbitrary(struct CFCParcel *parcel, const char *specifier);
 /** Find the actual class of an object variable without prefix.
  */
 void
-CFCType_resolve(CFCType *self, struct CFCClass **classes);
+CFCType_resolve(CFCType *self);
 
 void
 CFCType_destroy(CFCType *self);

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCVariable.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCVariable.c b/compiler/src/CFCVariable.c
index 4292e35..71e3473 100644
--- a/compiler/src/CFCVariable.c
+++ b/compiler/src/CFCVariable.c
@@ -85,8 +85,8 @@ CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
 }
 
 void
-CFCVariable_resolve_type(CFCVariable *self, struct CFCClass **classes) {
-    CFCType_resolve(self->type, classes);
+CFCVariable_resolve_type(CFCVariable *self) {
+    CFCType_resolve(self->type);
 }
 
 void

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/66b58c36/compiler/src/CFCVariable.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCVariable.h b/compiler/src/CFCVariable.h
index 7263de7..c67d3c6 100644
--- a/compiler/src/CFCVariable.h
+++ b/compiler/src/CFCVariable.h
@@ -57,7 +57,7 @@ CFCVariable_init(CFCVariable *self, struct CFCParcel *parcel,
                  struct CFCType *type, int inert);
 
 void
-CFCVariable_resolve_type(CFCVariable *self, struct CFCClass **classes);
+CFCVariable_resolve_type(CFCVariable *self);
 
 void
 CFCVariable_destroy(CFCVariable *self);


[lucy-commits] [3/5] git commit: Switch from implicit to explicit dependencies

Posted by nw...@apache.org.
Switch from implicit to explicit dependencies

Stop inferring the dependencies from the types used in a parcel. Use the
prerequisites from the parcel definition instead.


Project: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/commit/a96f7497
Tree: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/tree/a96f7497
Diff: http://git-wip-us.apache.org/repos/asf/lucy-clownfish/diff/a96f7497

Branch: refs/heads/explicit-dependencies
Commit: a96f749737069817893d1c2bf44653b516fb59ab
Parents: d657dab
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Mar 12 17:01:08 2014 +0100
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Mar 12 17:07:27 2014 +0100

----------------------------------------------------------------------
 compiler/perl/lib/Clownfish/CFC.xs | 11 +----
 compiler/perl/t/403-parcel.t       | 12 +----
 compiler/src/CFCBindCore.c         | 39 ++++++++--------
 compiler/src/CFCClass.c            |  8 ++++
 compiler/src/CFCParcel.c           | 80 +++++++++++++--------------------
 compiler/src/CFCParcel.h           | 24 +++++-----
 compiler/src/CFCType.c             | 26 ++---------
 7 files changed, 78 insertions(+), 122 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/perl/lib/Clownfish/CFC.xs
----------------------------------------------------------------------
diff --git a/compiler/perl/lib/Clownfish/CFC.xs b/compiler/perl/lib/Clownfish/CFC.xs
index 410658d..faa74f3 100644
--- a/compiler/perl/lib/Clownfish/CFC.xs
+++ b/compiler/perl/lib/Clownfish/CFC.xs
@@ -1148,13 +1148,6 @@ CODE:
 OUTPUT: RETVAL
 
 void
-add_dependent_parcel(self, dependent)
-    CFCParcel *self;
-    CFCParcel *dependent;
-PPCODE:
-    CFCParcel_add_dependent_parcel(self, dependent);
-
-void
 add_inherited_parcel(self, inherited)
     CFCParcel *self;
     CFCParcel *inherited;
@@ -1178,7 +1171,7 @@ ALIAS:
     get_PREFIX = 10
     get_version = 12
     included    = 14
-    dependent_parcels = 16
+    prereq_parcels    = 16
     inherited_parcels = 18
 PPCODE:
 {
@@ -1217,7 +1210,7 @@ PPCODE:
             retval = newSViv(CFCParcel_included(self));
             break;
         case 16: {
-                CFCParcel **parcels = CFCParcel_dependent_parcels(self);
+                CFCParcel **parcels = CFCParcel_prereq_parcels(self);
                 retval = S_array_of_cfcbase_to_av((CFCBase**)parcels);
                 FREEMEM(parcels);
             }

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/perl/t/403-parcel.t
----------------------------------------------------------------------
diff --git a/compiler/perl/t/403-parcel.t b/compiler/perl/t/403-parcel.t
index c311987..540e6ba 100644
--- a/compiler/perl/t/403-parcel.t
+++ b/compiler/perl/t/403-parcel.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 18;
+use Test::More tests => 17;
 use File::Spec::Functions qw( catfile );
 
 BEGIN { use_ok('Clownfish::CFC::Model::Parcel') }
@@ -50,17 +50,7 @@ my $parcels = Clownfish::CFC::Model::Parcel->all_parcels;
 my @names = sort(map { $_->get_name } @$parcels);
 is_deeply( \@names, [ "Foo", "IncludedFoo" ], "all_parcels" );
 
-my $dependent_foo = Clownfish::CFC::Model::Parcel->new(
-    name        => "DependentFoo",
-    is_included => 1,
-);
-$dependent_foo->register;
-
 $foo->add_inherited_parcel($included_foo);
-$foo->add_dependent_parcel($dependent_foo);
-my @dep_names = sort(map { $_->get_name } @{ $foo->dependent_parcels });
-is_deeply( \@dep_names, [ "DependentFoo", "IncludedFoo" ],
-           "dependent_parcels" );
 my @inh_names = sort(map { $_->get_name } @{ $foo->inherited_parcels });
 is_deeply( \@inh_names, [ "IncludedFoo" ], "inherited_parcels" );
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/src/CFCBindCore.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCBindCore.c b/compiler/src/CFCBindCore.c
index 5ae8ac6..e8d49e6 100644
--- a/compiler/src/CFCBindCore.c
+++ b/compiler/src/CFCBindCore.c
@@ -283,14 +283,15 @@ S_write_parcel_h(CFCBindCore *self, CFCParcel *parcel) {
         extra_defs = "";
         extra_includes = CFCUtil_strdup("");
 
-        // Include parcel.h of dependent parcels.
-        CFCParcel **dep_parcels = CFCParcel_dependent_parcels(parcel);
-        for (size_t i = 0; dep_parcels[i]; ++i) {
-            const char *dep_prefix = CFCParcel_get_prefix(dep_parcels[i]);
+        // Include parcel.h of prerequisite parcels.
+        CFCParcel **prereq_parcels = CFCParcel_prereq_parcels(parcel);
+        for (size_t i = 0; prereq_parcels[i]; ++i) {
+            const char *prereq_prefix
+                = CFCParcel_get_prefix(prereq_parcels[i]);
             extra_includes = CFCUtil_cat(extra_includes, "#include <",
-                                         dep_prefix, "parcel.h>\n", NULL);
+                                         prereq_prefix, "parcel.h>\n", NULL);
         }
-        FREEMEM(dep_parcels);
+        FREEMEM(prereq_parcels);
     }
 
     const char pattern[] =
@@ -392,18 +393,18 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
     vt_specs = CFCUtil_cat(vt_specs, "\n};\n", NULL);
     FREEMEM(ordered);
 
-    // Bootstrapping code for dependent parcels.
+    // Bootstrapping code for prerequisite parcels.
     //
     // bootstrap_inheritance() first calls bootstrap_inheritance() for all
     // parcels from which classes are inherited. Then the VTables of the parcel
     // are initialized. It aborts on recursive invocation.
     //
     // bootstrap_parcel() first calls bootstrap_inheritance() of its own
-    // parcel. Then it calls bootstrap_parcel() for all dependent parcels.
+    // parcel. Then it calls bootstrap_parcel() for all prerequisite parcels.
     // Finally, it calls init_parcel(). Recursive invocation is allowed.
 
-    char *inh_bootstrap = CFCUtil_strdup("");
-    char *dep_bootstrap = CFCUtil_strdup("");
+    char *inh_bootstrap    = CFCUtil_strdup("");
+    char *prereq_bootstrap = CFCUtil_strdup("");
     CFCParcel **inh_parcels = CFCParcel_inherited_parcels(parcel);
     for (size_t i = 0; inh_parcels[i]; ++i) {
         const char *inh_prefix = CFCParcel_get_prefix(inh_parcels[i]);
@@ -411,13 +412,13 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
                                     "bootstrap_inheritance();\n", NULL);
     }
     FREEMEM(inh_parcels);
-    CFCParcel **dep_parcels = CFCParcel_dependent_parcels(parcel);
-    for (size_t i = 0; dep_parcels[i]; ++i) {
-        const char *dep_prefix = CFCParcel_get_prefix(dep_parcels[i]);
-        dep_bootstrap = CFCUtil_cat(dep_bootstrap, "    ", dep_prefix,
-                                    "bootstrap_parcel();\n", NULL);
+    CFCParcel **prereq_parcels = CFCParcel_prereq_parcels(parcel);
+    for (size_t i = 0; prereq_parcels[i]; ++i) {
+        const char *prereq_prefix = CFCParcel_get_prefix(prereq_parcels[i]);
+        prereq_bootstrap = CFCUtil_cat(prereq_bootstrap, "    ", prereq_prefix,
+                                       "bootstrap_parcel();\n", NULL);
     }
-    FREEMEM(dep_parcels);
+    FREEMEM(prereq_parcels);
 
     char pattern[] =
         "%s\n"
@@ -462,7 +463,7 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
         "    if (bootstrap_state >= 3) { return; }\n"
         "    %sbootstrap_inheritance();\n"
         "    bootstrap_state = 3;\n"
-        "%s" // Finish bootstrapping of all dependent parcels.
+        "%s" // Finish bootstrapping of all prerequisite parcels.
         "    %sinit_parcel();\n"
         "}\n"
         "\n"
@@ -470,7 +471,7 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
     char *file_content
         = CFCUtil_sprintf(pattern, self->header, privacy_syms, prefix,
                           includes, c_data, vt_specs, prefix, inh_bootstrap,
-                          num_specs, prefix, prefix, dep_bootstrap, prefix,
+                          num_specs, prefix, prefix, prereq_bootstrap, prefix,
                           self->footer);
 
     // Unlink then open file.
@@ -486,7 +487,7 @@ S_write_parcel_c(CFCBindCore *self, CFCParcel *parcel) {
     FREEMEM(c_data);
     FREEMEM(vt_specs);
     FREEMEM(inh_bootstrap);
-    FREEMEM(dep_bootstrap);
+    FREEMEM(prereq_bootstrap);
     FREEMEM(file_content);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/src/CFCClass.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCClass.c b/compiler/src/CFCClass.c
index c2d5a2b..61a9d42 100644
--- a/compiler/src/CFCClass.c
+++ b/compiler/src/CFCClass.c
@@ -361,6 +361,14 @@ CFCClass_add_child(CFCClass *self, CFCClass *child) {
     // Add parcel dependency.
     CFCParcel *parcel       = CFCClass_get_parcel(self);
     CFCParcel *child_parcel = CFCClass_get_parcel(child);
+    if (!CFCParcel_has_prereq(child_parcel, parcel)) {
+        CFCUtil_die("Class '%s' inherits from '%s', but parcel '%s' is not a"
+                    " prerequisite of '%s'",
+                    CFCClass_get_class_name(child),
+                    CFCClass_get_class_name(self),
+                    CFCParcel_get_name(parcel),
+                    CFCParcel_get_name(child_parcel));
+    }
     CFCParcel_add_inherited_parcel(child_parcel, parcel);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/src/CFCParcel.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.c b/compiler/src/CFCParcel.c
index 5217ff0..68b88dd 100644
--- a/compiler/src/CFCParcel.c
+++ b/compiler/src/CFCParcel.c
@@ -45,8 +45,6 @@ struct CFCParcel {
     char *privacy_sym;
     int is_included;
     int is_required;
-    char **dependent_parcels;
-    size_t num_dependent_parcels;
     char **inherited_parcels;
     size_t num_inherited_parcels;
     CFCPrereq **prereqs;
@@ -257,13 +255,9 @@ CFCParcel_init(CFCParcel *self, const char *name, const char *cnick,
     self->is_included = is_included;
     self->is_required = false;
 
-    // Initialize dependencies.
-    self->dependent_parcels = (char**)CALLOCATE(1, sizeof(char*));
-    self->num_dependent_parcels = 0;
+    // Initialize arrays.
     self->inherited_parcels = (char**)CALLOCATE(1, sizeof(char*));
     self->num_inherited_parcels = 0;
-
-    // Initialize prereqs.
     self->prereqs = (CFCPrereq**)CALLOCATE(1, sizeof(CFCPrereq*));
     self->num_prereqs = 0;
 
@@ -395,10 +389,6 @@ CFCParcel_destroy(CFCParcel *self) {
     FREEMEM(self->Prefix);
     FREEMEM(self->PREFIX);
     FREEMEM(self->privacy_sym);
-    for (size_t i = 0; self->dependent_parcels[i]; ++i) {
-        FREEMEM(self->dependent_parcels[i]);
-    }
-    FREEMEM(self->dependent_parcels);
     for (size_t i = 0; self->inherited_parcels[i]; ++i) {
         FREEMEM(self->inherited_parcels[i]);
     }
@@ -478,27 +468,6 @@ CFCParcel_required(CFCParcel *self) {
 }
 
 void
-CFCParcel_add_dependent_parcel(CFCParcel *self, CFCParcel *dependent) {
-    const char *name     = CFCParcel_get_name(self);
-    const char *dep_name = CFCParcel_get_name(dependent);
-
-    if (strcmp(name, dep_name) == 0) { return; }
-
-    for (size_t i = 0; self->dependent_parcels[i]; ++i) {
-        const char *other_name = self->dependent_parcels[i];
-        if (strcmp(other_name, dep_name) == 0) { return; }
-    }
-
-    size_t num_parcels = self->num_dependent_parcels;
-    self->dependent_parcels
-        = (char**)REALLOCATE(self->dependent_parcels,
-                             (num_parcels + 2) * sizeof(char*));
-    self->dependent_parcels[num_parcels]   = CFCUtil_strdup(dep_name);
-    self->dependent_parcels[num_parcels+1] = NULL;
-    self->num_dependent_parcels = num_parcels + 1;
-}
-
-void
 CFCParcel_add_inherited_parcel(CFCParcel *self, CFCParcel *inherited) {
     const char *name     = CFCParcel_get_name(self);
     const char *inh_name = CFCParcel_get_name(inherited);
@@ -517,22 +486,6 @@ CFCParcel_add_inherited_parcel(CFCParcel *self, CFCParcel *inherited) {
     self->inherited_parcels[num_parcels]   = CFCUtil_strdup(inh_name);
     self->inherited_parcels[num_parcels+1] = NULL;
     self->num_inherited_parcels = num_parcels + 1;
-
-    // Add to dependent parcels.
-    CFCParcel_add_dependent_parcel(self, inherited);
-}
-
-CFCParcel**
-CFCParcel_dependent_parcels(CFCParcel *self) {
-    CFCParcel **parcels
-        = (CFCParcel**)CALLOCATE(self->num_dependent_parcels + 1,
-                                 sizeof(CFCParcel*));
-
-    for (size_t i = 0; self->dependent_parcels[i]; ++i) {
-        parcels[i] = CFCParcel_fetch(self->dependent_parcels[i]);
-    }
-
-    return parcels;
 }
 
 CFCParcel**
@@ -553,6 +506,19 @@ CFCParcel_get_prereqs(CFCParcel *self) {
     return self->prereqs;
 }
 
+CFCParcel**
+CFCParcel_prereq_parcels(CFCParcel *self) {
+    CFCParcel **parcels
+        = (CFCParcel**)CALLOCATE(self->num_prereqs + 1, sizeof(CFCParcel*));
+
+    for (size_t i = 0; self->prereqs[i]; ++i) {
+        const char *name = CFCPrereq_get_name(self->prereqs[i]);
+        parcels[i] = CFCParcel_fetch(name);
+    }
+
+    return parcels;
+}
+
 void
 CFCParcel_check_prereqs(CFCParcel *self) {
     // This is essentially a depth-first search of the dependency graph.
@@ -587,6 +553,24 @@ CFCParcel_check_prereqs(CFCParcel *self) {
     }
 }
 
+int
+CFCParcel_has_prereq(CFCParcel *self, CFCParcel *parcel) {
+    const char *name = CFCParcel_get_name(parcel);
+
+    if (strcmp(CFCParcel_get_name(self), name) == 0) {
+        return true;
+    }
+
+    for (int i = 0; self->prereqs[i]; ++i) {
+        const char *prereq_name = CFCPrereq_get_name(self->prereqs[i]);
+        if (strcmp(prereq_name, name) == 0) {
+            return true;
+        }
+    }
+
+    return false;
+}
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self) {
     return self->name;

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/src/CFCParcel.h
----------------------------------------------------------------------
diff --git a/compiler/src/CFCParcel.h b/compiler/src/CFCParcel.h
index b64d8e2..73bfdc0 100644
--- a/compiler/src/CFCParcel.h
+++ b/compiler/src/CFCParcel.h
@@ -127,23 +127,12 @@ CFCParcel_included(CFCParcel *self);
 int
 CFCParcel_required(CFCParcel *self);
 
-/** Add another Parcel that the Parcel depends on.
- */
-void
-CFCParcel_add_dependent_parcel(CFCParcel *self, CFCParcel *dependent);
-
 /** Add another Parcel containing superclasses that subclasses in the Parcel
- * extend. Also adds the other Parcel to the Parcel's dependencies.
+ * extend.
  */
 void
 CFCParcel_add_inherited_parcel(CFCParcel *self, CFCParcel *inherited);
 
-/** Return a NULL-terminated array of all Parcels that the Parcel depends on.
- * Must be freed by the caller.
- */
-CFCParcel**
-CFCParcel_dependent_parcels(CFCParcel *self);
-
 /** Return a NULL-terminated array of all Parcels containing superclasses that
  * subclasses in the Parcel extend. Must be freed by the caller.
  */
@@ -155,12 +144,23 @@ CFCParcel_inherited_parcels(CFCParcel *self);
 CFCPrereq**
 CFCParcel_get_prereqs(CFCParcel *self);
 
+/** Return a NULL-terminated array of all prerequisite Parcels. Must be freed
+ * by the caller.
+ */
+CFCParcel**
+CFCParcel_prereq_parcels(CFCParcel *self);
+
 /** Recursively verify that all prerequisite parcels are present in the
  * required version. Mark all needed parcels including 'self' as required.
  */
 void
 CFCParcel_check_prereqs(CFCParcel *self);
 
+/** Return true if parcel equals self or is a direct prerequisite of self.
+ */
+int
+CFCParcel_has_prereq(CFCParcel *self, CFCParcel *parcel);
+
 const char*
 CFCPrereq_get_name(CFCPrereq *self);
 

http://git-wip-us.apache.org/repos/asf/lucy-clownfish/blob/a96f7497/compiler/src/CFCType.c
----------------------------------------------------------------------
diff --git a/compiler/src/CFCType.c b/compiler/src/CFCType.c
index a41ecbd..3ff7db7 100644
--- a/compiler/src/CFCType.c
+++ b/compiler/src/CFCType.c
@@ -271,11 +271,10 @@ CFCType_resolve(CFCType *self, CFCClass **classes) {
         return;
     }
 
-    CFCClass *klass     = NULL;
-    char     *specifier = self->specifier;
-
-    if (isupper(self->specifier[0])) {
+    char *specifier = self->specifier;
+    if (isupper(specifier[0])) {
         // Try to find class from class list.
+        CFCClass *klass = NULL;
         for (size_t i = 0; classes[i]; ++i) {
             CFCClass   *maybe_class = classes[i];
             const char *struct_sym  = CFCClass_get_struct_sym(maybe_class);
@@ -297,25 +296,6 @@ CFCType_resolve(CFCType *self, CFCClass **classes) {
         self->specifier = CFCUtil_sprintf("%s%s", prefix, specifier);
         FREEMEM(specifier);
     }
-    else {
-        // Try to find class from class list.
-        for (size_t i = 0; classes[i]; ++i) {
-            CFCClass *maybe_class = classes[i];
-            const char *full_struct_sym
-                = CFCClass_full_struct_sym(maybe_class);
-
-            if (strcmp(specifier, full_struct_sym) == 0) {
-                klass = maybe_class;
-                break;
-            }
-        }
-    }
-
-    // Add parcel dependency.
-    if (klass) {
-        CFCParcel *class_parcel = CFCClass_get_parcel(klass);
-        CFCParcel_add_dependent_parcel(self->parcel, class_parcel);
-    }
 }
 
 void