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/15 20:45:16 UTC

[lucy-commits] [5/6] git commit: refs/heads/separate-clownfish-wip4 - Inherit metadata for Perl bindings from other parcels

Inherit metadata for Perl bindings from other parcels


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

Branch: refs/heads/separate-clownfish-wip4
Commit: 730c114a462f821a571c7d1b65ee3ab5092d88e6
Parents: a44bd32
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Jun 15 19:27:11 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Jun 15 20:39:30 2013 +0200

----------------------------------------------------------------------
 .../perl/lib/Clownfish/CFC/Perl/Build.pm        |  2 +-
 perl/buildlib/Lucy/Build.pm                     | 15 +++-------
 perl/buildlib/Lucy/Build/Binding/Misc.pm        | 30 +++++++++++++++++++-
 3 files changed, 34 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/730c114a/clownfish/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
----------------------------------------------------------------------
diff --git a/clownfish/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm b/clownfish/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
index 0243aad..8316c8e 100644
--- a/clownfish/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
+++ b/clownfish/compiler/perl/lib/Clownfish/CFC/Perl/Build.pm
@@ -240,7 +240,7 @@ sub _compile_clownfish {
         my $package_name = $pm_filepath;
         $package_name =~ s/buildlib\/(.*)\.pm$/$1/;
         $package_name =~ s/\//::/g;
-        $package_name->bind_all;
+        $package_name->bind_all($hierarchy);
     }
 
     my $binding = Clownfish::CFC::Binding::Perl->new(

http://git-wip-us.apache.org/repos/asf/lucy/blob/730c114a/perl/buildlib/Lucy/Build.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build.pm b/perl/buildlib/Lucy/Build.pm
index 97016ed..b7dfa29 100644
--- a/perl/buildlib/Lucy/Build.pm
+++ b/perl/buildlib/Lucy/Build.pm
@@ -20,6 +20,10 @@ use lib '../clownfish/compiler/perl/blib/arch';
 use lib '../clownfish/compiler/perl/blib/lib';
 use lib 'clownfish/compiler/perl/blib/arch';
 use lib 'clownfish/compiler/perl/blib/lib';
+use lib '../clownfish/runtime/perl/blib/arch';
+use lib '../clownfish/runtime/perl/blib/lib';
+use lib 'clownfish/runtime/perl/blib/arch';
+use lib 'clownfish/runtime/perl/blib/lib';
 
 package Lucy::Build;
 
@@ -166,17 +170,6 @@ sub ACTION_clownfish {
     $self->SUPER::ACTION_clownfish;
 }
 
-sub ACTION_test {
-    my $self = shift;
-
-    # Add blib dirs of Clownfish runtime to @INC
-    local @INC = @INC;
-    push( @INC, catdir( $CFR_DIR, qw( blib lib ) ) );
-    push( @INC, catdir( $CFR_DIR, qw( blib arch ) ) );
-
-    $self->SUPER::ACTION_test;
-}
-
 sub ACTION_suppressions {
     my $self       = shift;
     my $LOCAL_SUPP = 'local.supp';

http://git-wip-us.apache.org/repos/asf/lucy/blob/730c114a/perl/buildlib/Lucy/Build/Binding/Misc.pm
----------------------------------------------------------------------
diff --git a/perl/buildlib/Lucy/Build/Binding/Misc.pm b/perl/buildlib/Lucy/Build/Binding/Misc.pm
index 2e6e0e7..3a779c0 100644
--- a/perl/buildlib/Lucy/Build/Binding/Misc.pm
+++ b/perl/buildlib/Lucy/Build/Binding/Misc.pm
@@ -20,13 +20,41 @@ our $VERSION = '0.003000';
 $VERSION = eval $VERSION;
 
 sub bind_all {
-    my $class = shift;
+    my ($class, $hierarchy) = @_;
+    $class->inherit_metadata($hierarchy);
     $class->bind_lucy;
     $class->bind_test;
     $class->bind_testschema;
     $class->bind_bbsortex;
 }
 
+sub inherit_metadata {
+    my ($class, $hierarchy) = @_;
+
+    require Clownfish;
+
+    for my $class (@{ $hierarchy->ordered_classes }) {
+        next if $class->get_parcel->get_name ne 'Clownfish' || $class->inert;
+
+        my $class_name = $class->get_class_name;
+        my $vtable     = Clownfish::VTable->fetch_vtable($class_name);
+
+        for my $rt_method (@{ $vtable->get_methods }) {
+            if ($rt_method->is_excluded_from_host) {
+                my $method = $class->method($rt_method->get_name);
+                $method->exclude_from_host;
+            }
+            else {
+                my $alias = $rt_method->get_host_alias;
+                if (defined($alias)) {
+                    my $method = $class->method($rt_method->get_name);
+                    $method->set_host_alias($alias);
+                }
+            }
+        }
+    }
+}
+
 sub bind_lucy {
     my $xs_code = <<'END_XS_CODE';
 MODULE = Lucy    PACKAGE = Lucy