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 2010/11/03 23:32:36 UTC
[lucy-commits] svn commit: r1030736 - in /incubator/lucy/trunk:
clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm perl/lib/KinoSearch.pm
perl/t/018-host.t perl/t/binding/017-hash.t
Author: marvin
Date: Wed Nov 3 22:32:36 2010
New Revision: 1030736
URL: http://svn.apache.org/viewvc?rev=1030736&view=rev
Log:
Change name of utility function for translating perl complex data structures
to Clownfish.
Modified:
incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
incubator/lucy/trunk/perl/lib/KinoSearch.pm
incubator/lucy/trunk/perl/t/018-host.t
incubator/lucy/trunk/perl/t/binding/017-hash.t
Modified: incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm?rev=1030736&r1=1030735&r2=1030736&view=diff
==============================================================================
--- incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm (original)
+++ incubator/lucy/trunk/clownfish/lib/Clownfish/Binding/Perl/TypeMap.pm Wed Nov 3 22:32:36 2010
@@ -97,7 +97,7 @@ sub _sv_to_cf_obj {
}
}
-sub _void_star_to_kino {
+sub _void_star_to_clownfish {
my ( $type, $cf_var, $xs_var ) = @_;
# Assume that void* is a reference SV -- either a hashref or an arrayref.
return qq|if (SvROK($xs_var)) {
@@ -124,7 +124,7 @@ sub from_perl {
}
elsif ( $type->is_composite ) {
if ( $type->to_c eq 'void*' ) {
- return _void_star_to_kino( $type, $cf_var, $xs_var );
+ return _void_star_to_clownfish( $type, $cf_var, $xs_var );
}
}
Modified: incubator/lucy/trunk/perl/lib/KinoSearch.pm
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/lib/KinoSearch.pm?rev=1030736&r1=1030735&r2=1030736&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/lib/KinoSearch.pm (original)
+++ incubator/lucy/trunk/perl/lib/KinoSearch.pm Wed Nov 3 22:32:36 2010
@@ -30,7 +30,7 @@ BEGIN { XSLoader::load( 'KinoSearch', '0
BEGIN {
push our @ISA, 'Exporter';
- our @EXPORT_OK = qw( to_kino to_perl kdump );
+ our @EXPORT_OK = qw( to_clownfish to_perl kdump );
}
use KinoSearch::Autobinding;
@@ -97,7 +97,7 @@ sub error {$KinoSearch::Object::Err::err
{
package KinoSearch::Analysis::Stopalizer;
- use KinoSearch qw( to_kino );
+ use KinoSearch qw( to_clownfish );
sub gen_stoplist {
my ( undef, $language ) = @_;
@@ -106,7 +106,7 @@ sub error {$KinoSearch::Object::Err::err
if ( $language =~ /^(?:da|de|en|es|fi|fr|hu|it|nl|no|pt|ru|sv)$/ ) {
my $stoplist
= Lingua::StopWords::getStopWords( $language, 'UTF-8' );
- return to_kino($stoplist);
+ return to_clownfish($stoplist);
}
return undef;
}
@@ -175,8 +175,8 @@ sub error {$KinoSearch::Object::Err::err
{
package KinoSearch::Object::Obj;
- use KinoSearch qw( to_kino to_perl );
- sub load { return $_[0]->_load( to_kino( $_[1] ) ) }
+ use KinoSearch qw( to_clownfish to_perl );
+ sub load { return $_[0]->_load( to_clownfish( $_[1] ) ) }
}
{
@@ -256,7 +256,7 @@ sub error {$KinoSearch::Object::Err::err
{
package KinoSearch::Index::PolyReader;
- use KinoSearch qw( to_kino );
+ use KinoSearch qw( to_clownfish );
sub try_read_snapshot {
my ( undef, %args ) = @_;
@@ -273,7 +273,7 @@ sub error {$KinoSearch::Object::Err::err
my $snapshot = $self->get_snapshot;
my $seg_readers = KinoSearch::Object::VArray->new(
capacity => scalar @$segments );
- my $segs = to_kino($segments); # FIXME: Don't convert twice.
+ my $segs = to_clownfish($segments); # FIXME: Don't convert twice.
eval {
# Create a SegReader for each segment in the index.
my $num_segs = scalar @$segments;
@@ -297,11 +297,11 @@ sub error {$KinoSearch::Object::Err::err
{
package KinoSearch::Index::Segment;
- use KinoSearch qw( to_kino );
+ use KinoSearch qw( to_clownfish );
sub store_metadata {
my ( $self, %args ) = @_;
$self->_store_metadata( %args,
- metadata => to_kino( $args{metadata} ) );
+ metadata => to_clownfish( $args{metadata} ) );
}
}
@@ -537,7 +537,7 @@ sub error {$KinoSearch::Object::Err::err
{
package KinoSearch::Util::Json;
use Scalar::Util qw( blessed );
- use KinoSearch qw( to_kino );
+ use KinoSearch qw( to_clownfish );
use JSON::XS qw();
@@ -550,7 +550,7 @@ sub error {$KinoSearch::Object::Err::err
my $len = $instream->length;
my $json;
$instream->read( $json, $len );
- my $result = eval { to_kino( $json_encoder->decode($json) ) };
+ my $result = eval { to_clownfish( $json_encoder->decode($json) ) };
if ( $@ or !$result ) {
KinoSearch::Object::Err->set_error(
KinoSearch::Object::Err->new( $@ || "Failed to decode JSON" )
@@ -594,7 +594,7 @@ sub error {$KinoSearch::Object::Err::err
}
sub from_json {
- return to_kino( $json_encoder->decode( $_[1] ) );
+ return to_clownfish( $json_encoder->decode( $_[1] ) );
}
sub set_tolerant { $json_encoder->allow_nonref( $_[1] ) }
@@ -629,7 +629,7 @@ OUTPUT:
RETVAL
SV*
-to_kino(sv)
+to_clownfish(sv)
SV *sv;
CODE:
{
Modified: incubator/lucy/trunk/perl/t/018-host.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/018-host.t?rev=1030736&r1=1030735&r2=1030736&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/018-host.t (original)
+++ incubator/lucy/trunk/perl/t/018-host.t Wed Nov 3 22:32:36 2010
@@ -18,7 +18,7 @@ use warnings;
use Test::More tests => 8;
use KinoSearch::Test;
-use KinoSearch qw( to_perl to_kino );
+use KinoSearch qw( to_perl to_clownfish );
my $object = KinoSearch::Object::Host->new();
isa_ok( $object, "KinoSearch::Object::Host" );
@@ -34,7 +34,7 @@ my %complex_data_structure = (
a => [ 1, 2, 3, { ooga => 'booga' } ],
b => { foo => 'foofoo', bar => 'barbar' },
);
-my $kobj = to_kino( \%complex_data_structure );
+my $kobj = to_clownfish( \%complex_data_structure );
isa_ok( $kobj, 'KinoSearch::Object::Obj' );
my $transformed = to_perl($kobj);
is_deeply( $transformed, \%complex_data_structure,
@@ -47,7 +47,7 @@ my $salt_and_pepper = KinoSearch::Object
$salt_and_pepper->store( 'salt', KinoSearch::Object::ByteBuf->new('pepper') );
$complex_data_structure{c} = $bread_and_butter;
$complex_data_structure{d} = $salt_and_pepper;
-$transformed = to_perl( to_kino( \%complex_data_structure ) );
+$transformed = to_perl( to_clownfish( \%complex_data_structure ) );
$complex_data_structure{c} = { bread => 'butter' };
$complex_data_structure{d} = { salt => 'pepper' };
is_deeply( $transformed, \%complex_data_structure,
Modified: incubator/lucy/trunk/perl/t/binding/017-hash.t
URL: http://svn.apache.org/viewvc/incubator/lucy/trunk/perl/t/binding/017-hash.t?rev=1030736&r1=1030735&r2=1030736&view=diff
==============================================================================
--- incubator/lucy/trunk/perl/t/binding/017-hash.t (original)
+++ incubator/lucy/trunk/perl/t/binding/017-hash.t Wed Nov 3 22:32:36 2010
@@ -19,7 +19,7 @@ use warnings;
use Test::More tests => 4;
use Storable qw( nfreeze thaw );
use KinoSearch::Test;
-use KinoSearch qw( to_perl to_kino );
+use KinoSearch qw( to_perl to_clownfish );
my $hash = KinoSearch::Object::Hash->new( capacity => 10 );
$hash->store( "foo", KinoSearch::Object::CharBuf->new("bar") );
@@ -43,6 +43,6 @@ my $deserialized = $hash->deserialize($i
is_deeply( $hash->to_perl, $deserialized->to_perl, "serialize/deserialize" );
my %hash_with_utf8_keys = ( "\x{263a}" => "foo" );
-my $round_tripped = to_perl( to_kino( \%hash_with_utf8_keys ) );
+my $round_tripped = to_perl( to_clownfish( \%hash_with_utf8_keys ) );
is_deeply( $round_tripped, \%hash_with_utf8_keys,
"Round trip conversion of hash with UTF-8 keys" );