Author: marvin
Date: Sun Jul 22 12:59:05 2012
New Revision: 1364284
URL: http://svn.apache.org/viewvc?rev=1364284&view=rev
Log:
LUCY-242 Move Host under Clownfish.
Added:
lucy/trunk/core/Clownfish/Host.cfh
- copied, changed from r1364277, lucy/trunk/core/Lucy/Object/Host.cfh
lucy/trunk/perl/lib/Clownfish/Host.pm
- copied, changed from r1364277, lucy/trunk/perl/lib/Lucy/Object/Host.pm
lucy/trunk/perl/xs/Clownfish/Host.c
- copied, changed from r1364278, lucy/trunk/perl/xs/Lucy/Object/Host.c
Removed:
lucy/trunk/core/Lucy/Object/Host.cfh
lucy/trunk/perl/lib/Lucy/Object/Host.pm
lucy/trunk/perl/xs/Lucy/Object/Host.c
Modified:
lucy/trunk/clownfish/src/CFCPerl.c
lucy/trunk/core/Lucy/Util/Json.c
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/t/018-host.t
lucy/trunk/perl/xs/Clownfish/VTable.c
lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c
lucy/trunk/perl/xs/Lucy/Document/Doc.c
lucy/trunk/perl/xs/Lucy/Index/DocReader.c
lucy/trunk/perl/xs/Lucy/Object/Err.c
lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c
lucy/trunk/perl/xs/Lucy/Store/FSFolder.c
Modified: lucy/trunk/clownfish/src/CFCPerl.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCPerl.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCPerl.c (original)
+++ lucy/trunk/clownfish/src/CFCPerl.c Sun Jul 22 12:59:05 2012
@@ -372,7 +372,7 @@ S_xs_file_contents(CFCPerl *self, const
"#include \"parcel.h\"\n"
"#include \"%s\"\n"
"\n"
- "#include \"Lucy/Object/Host.h\"\n"
+ "#include \"Clownfish/Host.h\"\n"
"#include \"Lucy/Util/Memory.h\"\n"
"#include \"Lucy/Util/StringHelper.h\"\n"
"\n"
Copied: lucy/trunk/core/Clownfish/Host.cfh (from r1364277,
lucy/trunk/core/Lucy/Object/Host.cfh)
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Host.cfh?p2=lucy/trunk/core/Clownfish/Host.cfh&p1=lucy/trunk/core/Lucy/Object/Host.cfh&r1=1364277&r2=1364284&rev=1364284&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Host.cfh (original)
+++ lucy/trunk/core/Clownfish/Host.cfh Sun Jul 22 12:59:05 2012
@@ -66,7 +66,7 @@ __END_C__
* If the invoker is a VTable, it will be used to make a class
* callback rather than an object callback.
*/
-inert class Lucy::Object::Host {
+inert class Clownfish::Host {
/** Invoke an object method in a void context.
*/
Modified: lucy/trunk/core/Lucy/Util/Json.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json.c (original)
+++ lucy/trunk/core/Lucy/Util/Json.c Sun Jul 22 12:59:05 2012
@@ -20,7 +20,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Util/Json.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.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=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm Sun Jul 22 12:59:05
2012
@@ -306,7 +306,7 @@ END_XS_CODE
sub bind_host {
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::Host
+MODULE = Lucy PACKAGE = Clownfish::Host
=for comment
@@ -325,7 +325,7 @@ _test_obj(...)
CODE:
{
lucy_ByteBuf *test_obj = lucy_BB_new_bytes("blah", 4);
- SV *pack_var = get_sv("Lucy::Object::Host::testobj", 1);
+ SV *pack_var = get_sv("Clownfish::Host::testobj", 1);
RETVAL = (SV*)Lucy_BB_To_Host(test_obj);
SvSetSV_nosteal(pack_var, RETVAL);
CFISH_DECREF(test_obj);
@@ -384,7 +384,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::Host",
+ class_name => "Clownfish::Host",
);
$binding->append_xs($xs_code);
Copied: lucy/trunk/perl/lib/Clownfish/Host.pm (from r1364277,
lucy/trunk/perl/lib/Lucy/Object/Host.pm)
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/Host.pm?p2=lucy/trunk/perl/lib/Clownfish/Host.pm&p1=lucy/trunk/perl/lib/Lucy/Object/Host.pm&r1=1364277&r2=1364284&rev=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/Host.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/Host.pm Sun Jul 22 12:59:05 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::Host;
+package Clownfish::Host;
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=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Sun Jul 22 12:59:05 2012
@@ -478,7 +478,7 @@ sub error {$Lucy::Object::Err::error}
}
{
- package Lucy::Object::Host;
+ package Clownfish::Host;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
BEGIN {
Modified: lucy/trunk/perl/t/018-host.t
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/t/018-host.t?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/t/018-host.t (original)
+++ lucy/trunk/perl/t/018-host.t Sun Jul 22 12:59:05 2012
@@ -20,8 +20,8 @@ use Test::More tests => 8;
use Lucy::Test;
use Lucy qw( to_perl to_clownfish );
-my $object = Lucy::Object::Host->new();
-isa_ok( $object, "Lucy::Object::Host" );
+my $object = Clownfish::Host->new();
+isa_ok( $object, "Clownfish::Host" );
is( $object->_callback, undef, "void callback" );
is( $object->_callback_f64, 5, "f64 callback" );
Copied: lucy/trunk/perl/xs/Clownfish/Host.c (from r1364278,
lucy/trunk/perl/xs/Lucy/Object/Host.c)
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Host.c?p2=lucy/trunk/perl/xs/Clownfish/Host.c&p1=lucy/trunk/perl/xs/Lucy/Object/Host.c&r1=1364278&r2=1364284&rev=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Host.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Host.c Sun Jul 22 12:59:05 2012
@@ -19,7 +19,7 @@
#include "Clownfish/VTable.h"
#include "Lucy/Object/Obj.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Object/CharBuf.h"
#include "Lucy/Object/Err.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/Clownfish/VTable.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/VTable.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/VTable.c (original)
+++ lucy/trunk/perl/xs/Clownfish/VTable.c Sun Jul 22 12:59:05 2012
@@ -19,7 +19,7 @@
#include "XSBind.h"
#include "Clownfish/VTable.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Util/Memory.h"
lucy_Obj*
Modified: lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c (original)
+++ lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c Sun Jul 22 12:59:05 2012
@@ -21,7 +21,7 @@
#include "Lucy/Analysis/RegexTokenizer.h"
#include "Lucy/Analysis/Token.h"
#include "Lucy/Analysis/Inversion.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Util/Memory.h"
#include "Lucy/Util/StringHelper.h"
Modified: lucy/trunk/perl/xs/Lucy/Document/Doc.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Document/Doc.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ lucy/trunk/perl/xs/Lucy/Document/Doc.c Sun Jul 22 12:59:05 2012
@@ -17,7 +17,7 @@
#define C_LUCY_DOC
#include "XSBind.h"
#include "Lucy/Document/Doc.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/Memory.h"
Modified: lucy/trunk/perl/xs/Lucy/Index/DocReader.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Index/DocReader.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Index/DocReader.c (original)
+++ lucy/trunk/perl/xs/Lucy/Index/DocReader.c Sun Jul 22 12:59:05 2012
@@ -25,7 +25,7 @@
#include "Lucy/Plan/Schema.h"
#include "Lucy/Plan/TextType.h"
#include "Lucy/Plan/NumericType.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Store/InStream.h"
lucy_HitDoc*
Modified: lucy/trunk/perl/xs/Lucy/Object/Err.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/Err.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Err.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/Err.c Sun Jul 22 12:59:05 2012
@@ -15,7 +15,7 @@
*/
#include "XSBind.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
// Anonymous XSUB helper for Err#trap(). It wraps the supplied C function
// so that it can be run inside a Perl eval block.
Modified: lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c (original)
+++ lucy/trunk/perl/xs/Lucy/Object/LockFreeRegistry.c Sun Jul 22 12:59:05 2012
@@ -19,7 +19,7 @@
#include "XSBind.h"
#include "Clownfish/LockFreeRegistry.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
void*
lucy_LFReg_to_host(lucy_LockFreeRegistry *self) {
Modified: lucy/trunk/perl/xs/Lucy/Store/FSFolder.c
URL:
http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Store/FSFolder.c?rev=1364284&r1=1364283&r2=1364284&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Store/FSFolder.c (original)
+++ lucy/trunk/perl/xs/Lucy/Store/FSFolder.c Sun Jul 22 12:59:05 2012
@@ -15,7 +15,7 @@
*/
#include "Lucy/Util/ToolSet.h"
-#include "Lucy/Object/Host.h"
+#include "Clownfish/Host.h"
#include "Lucy/Store/FSFolder.h"
CharBuf*
