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 2012/07/22 17:25:07 UTC
[lucy-commits] svn commit: r1364327 - in /lucy/trunk: c/src/ clownfish/src/ core/Clownfish/
core/Lucy/Object/ core/Lucy/Store/ core/Lucy/Test/Object/ core/Lucy/Util/
core/Lucy/Util/Json/ example-lang/src/ perl/buildlib/Lucy/Build/Binding/
perl/lib/ perl/lib/Clownfish...
Author: marvin
Date: Sun Jul 22 15:25:06 2012
New Revision: 1364327
URL: http://svn.apache.org/viewvc?rev=1364327&view=rev
Log:
LUCY-242 Move CharBuf and subclasses under Clownfish.
Added:
lucy/trunk/core/Clownfish/CharBuf.c
- copied, changed from r1364278, lucy/trunk/core/Lucy/Object/CharBuf.c
lucy/trunk/core/Clownfish/CharBuf.cfh
- copied, changed from r1364277, lucy/trunk/core/Lucy/Object/CharBuf.cfh
lucy/trunk/perl/lib/Clownfish/CharBuf.pm
- copied, changed from r1364277, lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm
Removed:
lucy/trunk/core/Lucy/Object/CharBuf.c
lucy/trunk/core/Lucy/Object/CharBuf.cfh
lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm
Modified:
lucy/trunk/c/src/CFBind.h
lucy/trunk/clownfish/src/CFCPerl.c
lucy/trunk/core/Clownfish/Hash.c
lucy/trunk/core/Clownfish/Method.c
lucy/trunk/core/Clownfish/Num.c
lucy/trunk/core/Clownfish/VTable.c
lucy/trunk/core/Lucy/Object/Err.c
lucy/trunk/core/Lucy/Object/Obj.c
lucy/trunk/core/Lucy/Store/FSDirHandle.c
lucy/trunk/core/Lucy/Test/Object/TestLockFreeRegistry.cfh
lucy/trunk/core/Lucy/Util/Json/JsonParser.y
lucy/trunk/core/Lucy/Util/ToolSet.h
lucy/trunk/example-lang/src/CFBind.h
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/t/021-vtable.t
lucy/trunk/perl/t/109-read_locking.t
lucy/trunk/perl/t/505-hit_queue.t
lucy/trunk/perl/t/520-match_doc.t
lucy/trunk/perl/t/binding/016-varray.t
lucy/trunk/perl/t/binding/017-hash.t
lucy/trunk/perl/t/binding/029-charbuf.t
lucy/trunk/perl/t/binding/038-lock_free_registry.t
lucy/trunk/perl/xs/Clownfish/Host.c
lucy/trunk/perl/xs/Lucy/Object/Obj.c
lucy/trunk/perl/xs/XSBind.h
lucy/trunk/ruby/src/CFBind.h
Modified: lucy/trunk/c/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/c/src/CFBind.h?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/c/src/CFBind.h (original)
+++ lucy/trunk/c/src/CFBind.h Sun Jul 22 15:25:06 2012
@@ -27,7 +27,7 @@ extern "C" {
#include "charmony.h"
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/ByteBuf.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
Modified: lucy/trunk/clownfish/src/CFCPerl.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCPerl.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCPerl.c (original)
+++ lucy/trunk/clownfish/src/CFCPerl.c Sun Jul 22 15:25:06 2012
@@ -300,7 +300,7 @@ S_write_boot_c(CFCPerl *self) {
"#include \"XSUB.h\"\n"
"#include \"%s\"\n"
"#include \"parcel.h\"\n"
- "#include \"Lucy/Object/CharBuf.h\"\n"
+ "#include \"Clownfish/CharBuf.h\"\n"
"#include \"Clownfish/VTable.h\"\n"
"%s\n"
"\n"
Copied: lucy/trunk/core/Clownfish/CharBuf.c (from r1364278, lucy/trunk/core/Lucy/Object/CharBuf.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/CharBuf.c?p2=lucy/trunk/core/Clownfish/CharBuf.c&p1=lucy/trunk/core/Lucy/Object/CharBuf.c&r1=1364278&r2=1364327&rev=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/CharBuf.c (original)
+++ lucy/trunk/core/Clownfish/CharBuf.c Sun Jul 22 15:25:06 2012
@@ -26,7 +26,7 @@
#include <ctype.h>
#include "Clownfish/VTable.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Store/InStream.h"
Copied: lucy/trunk/core/Clownfish/CharBuf.cfh (from r1364277, lucy/trunk/core/Lucy/Object/CharBuf.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/CharBuf.cfh?p2=lucy/trunk/core/Clownfish/CharBuf.cfh&p1=lucy/trunk/core/Lucy/Object/CharBuf.cfh&r1=1364277&r2=1364327&rev=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/CharBuf.cfh (original)
+++ lucy/trunk/core/Clownfish/CharBuf.cfh Sun Jul 22 15:25:06 2012
@@ -20,7 +20,7 @@ parcel Lucy;
* Growable buffer holding Unicode characters.
*/
-class Lucy::Object::CharBuf cnick CB
+class Clownfish::CharBuf cnick CB
inherits Lucy::Object::Obj {
char *ptr;
@@ -313,8 +313,8 @@ class Lucy::Object::CharBuf cnick CB
Cat_Trusted_Str(CharBuf *self, const char *ptr, size_t size);
}
-class Lucy::Object::ViewCharBuf cnick ViewCB
- inherits Lucy::Object::CharBuf {
+class Clownfish::ViewCharBuf cnick ViewCB
+ inherits Clownfish::CharBuf {
inert incremented ViewCharBuf*
new_from_utf8(const char *utf8, size_t size);
@@ -351,8 +351,8 @@ class Lucy::Object::ViewCharBuf cnick Vi
Destroy(ViewCharBuf *self);
}
-class Lucy::Object::ZombieCharBuf cnick ZCB
- inherits Lucy::Object::ViewCharBuf {
+class Clownfish::ZombieCharBuf cnick ZCB
+ inherits Clownfish::ViewCharBuf {
/** Return a ZombieCharBuf with a blank string.
*/
Modified: lucy/trunk/core/Clownfish/Hash.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Hash.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Hash.c (original)
+++ lucy/trunk/core/Clownfish/Hash.c Sun Jul 22 15:25:06 2012
@@ -25,7 +25,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/Hash.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/VArray.h"
#include "Lucy/Store/InStream.h"
Modified: lucy/trunk/core/Clownfish/Method.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Method.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Method.c (original)
+++ lucy/trunk/core/Clownfish/Method.c Sun Jul 22 15:25:06 2012
@@ -19,7 +19,7 @@
#define CHY_USE_SHORT_NAMES
#include "Clownfish/Method.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/VTable.h"
Modified: lucy/trunk/core/Clownfish/Num.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Num.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Num.c (original)
+++ lucy/trunk/core/Clownfish/Num.c Sun Jul 22 15:25:06 2012
@@ -27,7 +27,7 @@
#define CHY_USE_SHORT_NAMES
#include "Clownfish/Num.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
Modified: lucy/trunk/core/Clownfish/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VTable.c (original)
+++ lucy/trunk/core/Clownfish/VTable.c Sun Jul 22 15:25:06 2012
@@ -25,7 +25,7 @@
#include <ctype.h>
#include "Clownfish/VTable.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/LockFreeRegistry.h"
Modified: lucy/trunk/core/Lucy/Object/Err.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Err.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Err.c (original)
+++ lucy/trunk/core/Lucy/Object/Err.c Sun Jul 22 15:25:06 2012
@@ -25,7 +25,7 @@
#include <ctype.h>
#include "Lucy/Object/Err.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/core/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/Obj.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ lucy/trunk/core/Lucy/Object/Obj.c Sun Jul 22 15:25:06 2012
@@ -24,7 +24,7 @@
#include <string.h>
#include "Lucy/Object/Obj.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/VTable.h"
Modified: lucy/trunk/core/Lucy/Store/FSDirHandle.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/FSDirHandle.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/FSDirHandle.c (original)
+++ lucy/trunk/core/Lucy/Store/FSDirHandle.c Sun Jul 22 15:25:06 2012
@@ -22,7 +22,6 @@
#include <sys/stat.h>
#include "Lucy/Util/ToolSet.h"
-#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Object/VArray.h"
#include "Lucy/Store/FSDirHandle.h"
Modified: lucy/trunk/core/Lucy/Test/Object/TestLockFreeRegistry.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Object/TestLockFreeRegistry.cfh?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Object/TestLockFreeRegistry.cfh (original)
+++ lucy/trunk/core/Lucy/Test/Object/TestLockFreeRegistry.cfh Sun Jul 22 15:25:06 2012
@@ -23,7 +23,7 @@ inert class Lucy::Test::Object::TestLock
/** Private test-only class for stressing LockFreeRegistry.
*/
-class Lucy::Test::Object::StupidHashCharBuf inherits Lucy::Object::CharBuf {
+class Lucy::Test::Object::StupidHashCharBuf inherits Clownfish::CharBuf {
inert incremented StupidHashCharBuf*
new(const char *text);
Modified: lucy/trunk/core/Lucy/Util/Json/JsonParser.y
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json/JsonParser.y?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json/JsonParser.y (original)
+++ lucy/trunk/core/Lucy/Util/Json/JsonParser.y Sun Jul 22 15:25:06 2012
@@ -26,7 +26,7 @@
#include <assert.h>
#include "Clownfish/Hash.h"
#include "Lucy/Object/VArray.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Util/Json.h"
}
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Sun Jul 22 15:25:06 2012
@@ -39,7 +39,7 @@ extern "C" {
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/BitVector.h"
#include "Lucy/Object/ByteBuf.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Lucy/Object/I32Array.h"
Modified: lucy/trunk/example-lang/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/example-lang/src/CFBind.h?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/example-lang/src/CFBind.h (original)
+++ lucy/trunk/example-lang/src/CFBind.h Sun Jul 22 15:25:06 2012
@@ -27,7 +27,7 @@ extern "C" {
#include "charmony.h"
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/ByteBuf.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
Modified: lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm Sun Jul 22 15:25:06 2012
@@ -122,7 +122,7 @@ END_XS_CODE
sub bind_charbuf {
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::CharBuf
+MODULE = Lucy PACKAGE = Clownfish::CharBuf
SV*
new(either_sv, sv)
@@ -162,7 +162,7 @@ CODE:
RETVAL = XSBind_cb_to_sv(self);
OUTPUT: RETVAL
-MODULE = Lucy PACKAGE = Lucy::Object::ViewCharBuf
+MODULE = Lucy PACKAGE = Clownfish::ViewCharBuf
SV*
_new(unused, sv)
@@ -182,7 +182,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::CharBuf",
+ class_name => "Clownfish::CharBuf",
);
$binding->append_xs($xs_code);
$binding->exclude_constructor;
Copied: lucy/trunk/perl/lib/Clownfish/CharBuf.pm (from r1364277, lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/CharBuf.pm?p2=lucy/trunk/perl/lib/Clownfish/CharBuf.pm&p1=lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm&r1=1364277&r2=1364327&rev=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/CharBuf.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/CharBuf.pm Sun Jul 22 15:25:06 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::CharBuf;
+package Clownfish::CharBuf;
use Lucy;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
Modified: lucy/trunk/perl/lib/Lucy.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Lucy.pm?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Sun Jul 22 15:25:06 2012
@@ -161,7 +161,7 @@ sub error {$Lucy::Object::Err::error}
while ( my ( $symbol, $glob ) = each %$stash ) {
next if ref $glob;
next unless *$glob{CODE};
- $methods->push( Lucy::Object::CharBuf->new($symbol) );
+ $methods->push( Clownfish::CharBuf->new($symbol) );
}
return $methods;
}
@@ -308,7 +308,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::CharBuf;
+ package Clownfish::CharBuf;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
@@ -324,7 +324,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::ViewCharBuf;
+ package Clownfish::ViewCharBuf;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
use Carp;
@@ -332,7 +332,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::ZombieCharBuf;
+ package Clownfish::ZombieCharBuf;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
use Carp;
@@ -356,7 +356,7 @@ sub error {$Lucy::Object::Err::error}
my ( $either, $message ) = @_;
my ( undef, $file, $line ) = caller;
$message .= ", $file line $line\n";
- return $either->_new( mess => Lucy::Object::CharBuf->new($message) );
+ return $either->_new( mess => Clownfish::CharBuf->new($message) );
}
sub do_throw {
Modified: lucy/trunk/perl/t/021-vtable.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/021-vtable.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/021-vtable.t (original)
+++ lucy/trunk/perl/t/021-vtable.t Sun Jul 22 15:25:06 2012
@@ -81,7 +81,7 @@ isa_ok( $resurrected, "MyHash", "subclas
is( $resurrected->to_string, $stringified,
"It's the same Hash from earlier (though a different Perl object)" );
-my $booga = Lucy::Object::CharBuf->new("booga");
+my $booga = Clownfish::CharBuf->new("booga");
$resurrected->store( "ooga", $booga );
is( $resurrected->fetch("ooga"),
Modified: lucy/trunk/perl/t/109-read_locking.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/109-read_locking.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/109-read_locking.t (original)
+++ lucy/trunk/perl/t/109-read_locking.t Sun Jul 22 15:25:06 2012
@@ -99,7 +99,7 @@ Test_race_condition_1: {
to => 'seg_1.hidden',
);
Lucy::Index::IndexReader::set_race_condition_debug1(
- Lucy::Object::CharBuf->new($latest_snapshot_file) );
+ Clownfish::CharBuf->new($latest_snapshot_file) );
$reader = Lucy::Index::IndexReader->open(
index => $folder,
Modified: lucy/trunk/perl/t/505-hit_queue.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/505-hit_queue.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/505-hit_queue.t (original)
+++ lucy/trunk/perl/t/505-hit_queue.t Sun Jul 22 15:25:06 2012
@@ -170,7 +170,7 @@ $hit_q = Lucy::Search::HitQueue->new(
for my $doc_id ( shuffle( 1 .. 100 ) ) {
my $fields = $docs[ $doc_id - 1 ];
my $values = Lucy::Object::VArray->new( capacity => 1 );
- $values->push( Lucy::Object::CharBuf->new( $fields->{number} ) );
+ $values->push( Clownfish::CharBuf->new( $fields->{number} ) );
my $match_doc = Lucy::Search::MatchDoc->new(
doc_id => $doc_id,
score => $doc_id,
Modified: lucy/trunk/perl/t/520-match_doc.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/520-match_doc.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/520-match_doc.t (original)
+++ lucy/trunk/perl/t/520-match_doc.t Sun Jul 22 15:25:06 2012
@@ -37,8 +37,8 @@ is( $match_doc_copy->get_values, $match_
"empty values still empty after serialization" );
my $values = Lucy::Object::VArray->new( capacity => 4 );
-$values->store( 0, Lucy::Object::CharBuf->new("foo") );
-$values->store( 3, Lucy::Object::CharBuf->new("bar") );
+$values->store( 0, Clownfish::CharBuf->new("foo") );
+$values->store( 3, Clownfish::CharBuf->new("bar") );
$match_doc = Lucy::Search::MatchDoc->new(
doc_id => 120,
score => 35,
Modified: lucy/trunk/perl/t/binding/016-varray.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/016-varray.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/016-varray.t (original)
+++ lucy/trunk/perl/t/binding/016-varray.t Sun Jul 22 15:25:06 2012
@@ -23,7 +23,7 @@ use Lucy::Test;
my ( $varray, $twin );
$varray = Lucy::Object::VArray->new( capacity => 5 );
-$varray->push( Lucy::Object::CharBuf->new($_) ) for 1 .. 5;
+$varray->push( Clownfish::CharBuf->new($_) ) for 1 .. 5;
$varray->delete(3);
my $frozen = nfreeze($varray);
my $thawed = thaw($frozen);
Modified: lucy/trunk/perl/t/binding/017-hash.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/017-hash.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/017-hash.t (original)
+++ lucy/trunk/perl/t/binding/017-hash.t Sun Jul 22 15:25:06 2012
@@ -22,8 +22,8 @@ use Lucy::Test;
use Lucy qw( to_perl to_clownfish );
my $hash = Clownfish::Hash->new( capacity => 10 );
-$hash->store( "foo", Lucy::Object::CharBuf->new("bar") );
-$hash->store( "baz", Lucy::Object::CharBuf->new("banana") );
+$hash->store( "foo", Clownfish::CharBuf->new("bar") );
+$hash->store( "baz", Clownfish::CharBuf->new("banana") );
ok( !defined( $hash->fetch("blah") ),
"fetch for a non-existent key returns undef" );
Modified: lucy/trunk/perl/t/binding/029-charbuf.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/029-charbuf.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/029-charbuf.t (original)
+++ lucy/trunk/perl/t/binding/029-charbuf.t Sun Jul 22 15:25:06 2012
@@ -23,18 +23,18 @@ use Lucy::Test::TestUtils qw( utf8_test_
my ( $smiley, $not_a_smiley, $frowny ) = utf8_test_strings();
-my $charbuf = Lucy::Object::CharBuf->new($smiley);
-isa_ok( $charbuf, "Lucy::Object::CharBuf" );
+my $charbuf = Clownfish::CharBuf->new($smiley);
+isa_ok( $charbuf, "Clownfish::CharBuf" );
is( $charbuf->to_perl, $smiley, "round trip UTF-8" );
-$charbuf = Lucy::Object::CharBuf->new($smiley);
+$charbuf = Clownfish::CharBuf->new($smiley);
my $dupe = thaw( freeze($charbuf) );
-isa_ok( $dupe, "Lucy::Object::CharBuf",
+isa_ok( $dupe, "Clownfish::CharBuf",
"thaw/freeze produces correct object" );
is( $dupe->to_perl, $charbuf->to_perl, "freeze/thaw" );
my $clone = $charbuf->clone;
-is( $clone->to_perl, Lucy::Object::CharBuf->new($smiley)->to_perl, "clone" );
+is( $clone->to_perl, Clownfish::CharBuf->new($smiley)->to_perl, "clone" );
my $ram_file = Lucy::Store::RAMFile->new;
my $outstream = Lucy::Store::OutStream->open( file => $ram_file )
@@ -44,7 +44,7 @@ $outstream->close;
my $instream = Lucy::Store::InStream->open( file => $ram_file )
or die Lucy->error;
my $charbuf_vtable
- = Clownfish::VTable->singleton( class_name => 'Lucy::Object::CharBuf',
+ = Clownfish::VTable->singleton( class_name => 'Clownfish::CharBuf',
);
my $deserialized = $charbuf_vtable->make_obj->deserialize($instream);
is_deeply( $charbuf->to_perl, $deserialized->to_perl,
Modified: lucy/trunk/perl/t/binding/038-lock_free_registry.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/038-lock_free_registry.t?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/038-lock_free_registry.t (original)
+++ lucy/trunk/perl/t/binding/038-lock_free_registry.t Sun Jul 22 15:25:06 2012
@@ -50,7 +50,7 @@ sub register_many {
my $succeeded = 0;
for my $number (@$nums) {
- my $obj = Lucy::Object::CharBuf->new($number);
+ my $obj = Clownfish::CharBuf->new($number);
$succeeded += $registry->register( key => $obj, value => $obj );
}
Modified: lucy/trunk/perl/xs/Clownfish/Host.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Host.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/Host.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Host.c Sun Jul 22 15:25:06 2012
@@ -20,7 +20,7 @@
#include "Lucy/Object/Obj.h"
#include "Clownfish/Host.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/Lucy/Object/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Obj.c?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Obj.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Obj.c Sun Jul 22 15:25:06 2012
@@ -22,7 +22,7 @@
#include "ppport.h"
#include "Lucy/Object/Obj.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/VTable.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Sun Jul 22 15:25:06 2012
@@ -27,7 +27,7 @@ extern "C" {
#include "charmony.h"
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/ByteBuf.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"
Modified: lucy/trunk/ruby/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/ruby/src/CFBind.h?rev=1364327&r1=1364326&r2=1364327&view=diff
==============================================================================
--- lucy/trunk/ruby/src/CFBind.h (original)
+++ lucy/trunk/ruby/src/CFBind.h Sun Jul 22 15:25:06 2012
@@ -27,7 +27,7 @@ extern "C" {
#include "charmony.h"
#include "Lucy/Object/Obj.h"
#include "Lucy/Object/ByteBuf.h"
-#include "Lucy/Object/CharBuf.h"
+#include "Clownfish/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Clownfish/Hash.h"
#include "Clownfish/Num.h"