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 18:13:38 UTC
[lucy-commits] svn commit: r1364346 - in /lucy/trunk: c/src/ core/Clownfish/ core/Lucy/
core/Lucy/Analysis/ core/Lucy/Document/ core/Lucy/Highlight/
core/Lucy/Index/ core/Lucy/Object/ core/Lucy/Plan/ core/Lucy/Search/
core/Lucy/Search/QueryParser/ core/Lucy/Store/ co...
Author: marvin
Date: Sun Jul 22 16:13:35 2012
New Revision: 1364346
URL: http://svn.apache.org/viewvc?rev=1364346&view=rev
Log:
LUCY-242 Move Obj under Clownfish.
This commit is a mechanical search-and-replace; it does not cover tasks
such as adapting documentation.
Added:
lucy/trunk/core/Clownfish/Obj.c
- copied, changed from r1364340, lucy/trunk/core/Lucy/Object/Obj.c
lucy/trunk/core/Clownfish/Obj.cfh
- copied, changed from r1364277, lucy/trunk/core/Lucy/Object/Obj.cfh
lucy/trunk/perl/lib/Clownfish/Obj.pm
- copied, changed from r1364277, lucy/trunk/perl/lib/Lucy/Object/Obj.pm
lucy/trunk/perl/xs/Clownfish/Obj.c
- copied, changed from r1364340, lucy/trunk/perl/xs/Lucy/Object/Obj.c
Removed:
lucy/trunk/core/Lucy/Object/Obj.c
lucy/trunk/core/Lucy/Object/Obj.cfh
lucy/trunk/perl/lib/Lucy/Object/Obj.pm
lucy/trunk/perl/xs/Lucy/Object/Obj.c
Modified:
lucy/trunk/c/src/CFBind.h
lucy/trunk/core/Clownfish/ByteBuf.cfh
lucy/trunk/core/Clownfish/CharBuf.cfh
lucy/trunk/core/Clownfish/Err.cfh
lucy/trunk/core/Clownfish/Hash.cfh
lucy/trunk/core/Clownfish/LockFreeRegistry.cfh
lucy/trunk/core/Clownfish/Method.cfh
lucy/trunk/core/Clownfish/Num.cfh
lucy/trunk/core/Clownfish/VArray.cfh
lucy/trunk/core/Clownfish/VTable.cfh
lucy/trunk/core/Lucy/Analysis/Analyzer.cfh
lucy/trunk/core/Lucy/Analysis/Inversion.cfh
lucy/trunk/core/Lucy/Analysis/Token.cfh
lucy/trunk/core/Lucy/Document/Doc.cfh
lucy/trunk/core/Lucy/Highlight/HeatMap.cfh
lucy/trunk/core/Lucy/Highlight/Highlighter.cfh
lucy/trunk/core/Lucy/Index/BackgroundMerger.cfh
lucy/trunk/core/Lucy/Index/DataReader.cfh
lucy/trunk/core/Lucy/Index/DataWriter.cfh
lucy/trunk/core/Lucy/Index/DocVector.cfh
lucy/trunk/core/Lucy/Index/FilePurger.cfh
lucy/trunk/core/Lucy/Index/IndexManager.cfh
lucy/trunk/core/Lucy/Index/Indexer.cfh
lucy/trunk/core/Lucy/Index/Inverter.cfh
lucy/trunk/core/Lucy/Index/Lexicon.cfh
lucy/trunk/core/Lucy/Index/Segment.cfh
lucy/trunk/core/Lucy/Index/Similarity.cfh
lucy/trunk/core/Lucy/Index/Snapshot.cfh
lucy/trunk/core/Lucy/Index/SortCache.cfh
lucy/trunk/core/Lucy/Index/TermInfo.cfh
lucy/trunk/core/Lucy/Index/TermVector.cfh
lucy/trunk/core/Lucy/Object/BitVector.cfh
lucy/trunk/core/Lucy/Object/I32Array.cfh
lucy/trunk/core/Lucy/Plan/Architecture.cfh
lucy/trunk/core/Lucy/Plan/FieldType.cfh
lucy/trunk/core/Lucy/Plan/Schema.cfh
lucy/trunk/core/Lucy/Search/Collector.cfh
lucy/trunk/core/Lucy/Search/Hits.cfh
lucy/trunk/core/Lucy/Search/MatchDoc.cfh
lucy/trunk/core/Lucy/Search/Matcher.cfh
lucy/trunk/core/Lucy/Search/Query.cfh
lucy/trunk/core/Lucy/Search/QueryParser.cfh
lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh
lucy/trunk/core/Lucy/Search/QueryParser/QueryLexer.cfh
lucy/trunk/core/Lucy/Search/Searcher.cfh
lucy/trunk/core/Lucy/Search/SortRule.cfh
lucy/trunk/core/Lucy/Search/SortSpec.cfh
lucy/trunk/core/Lucy/Search/Span.cfh
lucy/trunk/core/Lucy/Search/TopDocs.cfh
lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh
lucy/trunk/core/Lucy/Store/DirHandle.cfh
lucy/trunk/core/Lucy/Store/FileHandle.cfh
lucy/trunk/core/Lucy/Store/FileWindow.cfh
lucy/trunk/core/Lucy/Store/Folder.cfh
lucy/trunk/core/Lucy/Store/InStream.cfh
lucy/trunk/core/Lucy/Store/Lock.cfh
lucy/trunk/core/Lucy/Store/LockFactory.cfh
lucy/trunk/core/Lucy/Store/OutStream.cfh
lucy/trunk/core/Lucy/Store/RAMFile.cfh
lucy/trunk/core/Lucy/Test.cfh
lucy/trunk/core/Lucy/Test/Object/TestByteBuf.cfh
lucy/trunk/core/Lucy/Test/Object/TestCharBuf.cfh
lucy/trunk/core/Lucy/Test/Search/TestQueryParser.cfh
lucy/trunk/core/Lucy/Util/Json.cfh
lucy/trunk/core/Lucy/Util/MemoryPool.cfh
lucy/trunk/core/Lucy/Util/PriorityQueue.cfh
lucy/trunk/core/Lucy/Util/SortExternal.cfh
lucy/trunk/core/Lucy/Util/Stepper.cfh
lucy/trunk/core/Lucy/Util/ToolSet.h
lucy/trunk/example-lang/README
lucy/trunk/example-lang/src/CFBind.h
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Misc.pm
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm
lucy/trunk/perl/t/018-host.t
lucy/trunk/perl/t/021-vtable.t
lucy/trunk/perl/t/026-serialization.t
lucy/trunk/perl/t/binding/019-obj.t
lucy/trunk/perl/xs/Clownfish/Host.c
lucy/trunk/perl/xs/Lucy/Document/Doc.c
lucy/trunk/perl/xs/XSBind.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=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/c/src/CFBind.h (original)
+++ lucy/trunk/c/src/CFBind.h Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ extern "C" {
#endif
#include "charmony.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
Modified: lucy/trunk/core/Clownfish/ByteBuf.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/ByteBuf.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/ByteBuf.cfh (original)
+++ lucy/trunk/core/Clownfish/ByteBuf.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
* Growable buffer holding arbitrary bytes.
*/
-class Clownfish::ByteBuf cnick BB inherits Lucy::Object::Obj {
+class Clownfish::ByteBuf cnick BB inherits Clownfish::Obj {
char *buf;
size_t size; /* number of valid bytes */
Modified: lucy/trunk/core/Clownfish/CharBuf.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/CharBuf.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/CharBuf.cfh (original)
+++ lucy/trunk/core/Clownfish/CharBuf.cfh Sun Jul 22 16:13:35 2012
@@ -21,7 +21,7 @@ parcel Lucy;
*/
class Clownfish::CharBuf cnick CB
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
char *ptr;
size_t size;
Modified: lucy/trunk/core/Clownfish/Err.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Err.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Err.cfh (original)
+++ lucy/trunk/core/Clownfish/Err.cfh Sun Jul 22 16:13:35 2012
@@ -42,7 +42,7 @@ __END_C__
* temporarily, so that calling code may choose how to handle a particular
* error condition.
*/
-public class Clownfish::Err inherits Lucy::Object::Obj {
+public class Clownfish::Err inherits Clownfish::Obj {
CharBuf *mess;
Modified: lucy/trunk/core/Clownfish/Hash.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Hash.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Hash.cfh (original)
+++ lucy/trunk/core/Clownfish/Hash.cfh Sun Jul 22 16:13:35 2012
@@ -24,7 +24,7 @@ parcel Lucy;
* this behavior can be changed by overridding Make_Key(), e.g. to implement
* efficient hash sets.
*/
-class Clownfish::Hash inherits Lucy::Object::Obj {
+class Clownfish::Hash inherits Clownfish::Obj {
void *entries;
uint32_t capacity;
@@ -150,7 +150,7 @@ class Clownfish::Hash inherits Lucy::Obj
}
class Clownfish::Hash::HashTombStone
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
uint32_t
Get_RefCount(HashTombStone* self);
Modified: lucy/trunk/core/Clownfish/LockFreeRegistry.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/LockFreeRegistry.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/LockFreeRegistry.cfh (original)
+++ lucy/trunk/core/Clownfish/LockFreeRegistry.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Specialized lock free hash table for storing VTables.
*/
-class Clownfish::LockFreeRegistry cnick LFReg inherits Lucy::Object::Obj {
+class Clownfish::LockFreeRegistry cnick LFReg inherits Clownfish::Obj {
size_t capacity;
void *entries;
Modified: lucy/trunk/core/Clownfish/Method.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Method.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Method.cfh (original)
+++ lucy/trunk/core/Clownfish/Method.cfh Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ parcel Lucy;
/** Method metadata.
*/
-class Clownfish::Method inherits Lucy::Object::Obj {
+class Clownfish::Method inherits Clownfish::Obj {
CharBuf *name;
lucy_method_t callback_func;
Modified: lucy/trunk/core/Clownfish/Num.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Num.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Num.cfh (original)
+++ lucy/trunk/core/Clownfish/Num.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Abstract base class for numbers.
*/
-abstract class Clownfish::Num inherits Lucy::Object::Obj {
+abstract class Clownfish::Num inherits Clownfish::Obj {
inert Num*
init(Num *self);
Copied: lucy/trunk/core/Clownfish/Obj.c (from r1364340, lucy/trunk/core/Lucy/Object/Obj.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Obj.c?p2=lucy/trunk/core/Clownfish/Obj.c&p1=lucy/trunk/core/Lucy/Object/Obj.c&r1=1364340&r2=1364346&rev=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.c (original)
+++ lucy/trunk/core/Clownfish/Obj.c Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@
#include <stdio.h>
#include <string.h>
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
Copied: lucy/trunk/core/Clownfish/Obj.cfh (from r1364277, lucy/trunk/core/Lucy/Object/Obj.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Obj.cfh?p2=lucy/trunk/core/Clownfish/Obj.cfh&p1=lucy/trunk/core/Lucy/Object/Obj.cfh&r1=1364277&r2=1364346&rev=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/Obj.cfh (original)
+++ lucy/trunk/core/Clownfish/Obj.cfh Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ parcel Lucy;
/** Base class for all Lucy objects.
*/
-public class Lucy::Object::Obj {
+public class Clownfish::Obj {
VTable *vtable;
lucy_ref_t ref;
Modified: lucy/trunk/core/Clownfish/VArray.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VArray.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VArray.cfh (original)
+++ lucy/trunk/core/Clownfish/VArray.cfh Sun Jul 22 16:13:35 2012
@@ -29,7 +29,7 @@ __END_C__
/** Variable-sized array.
*/
-class Clownfish::VArray cnick VA inherits Lucy::Object::Obj {
+class Clownfish::VArray cnick VA inherits Clownfish::Obj {
Obj **elems;
uint32_t size;
Modified: lucy/trunk/core/Clownfish/VTable.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VTable.cfh (original)
+++ lucy/trunk/core/Clownfish/VTable.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* behavior of VTables.)
*/
-class Clownfish::VTable inherits Lucy::Object::Obj {
+class Clownfish::VTable inherits Clownfish::Obj {
VTable *parent;
CharBuf *name;
@@ -87,7 +87,7 @@ class Clownfish::VTable inherits Lucy::O
fetch_vtable(const CharBuf *class_name);
/** Given a class name, return the name of a parent class which descends
- * from Lucy::Object::Obj, or NULL if such a class can't be found.
+ * from Clownfish::Obj, or NULL if such a class can't be found.
*/
inert nullable CharBuf*
find_parent_class(const CharBuf *class_name);
Modified: lucy/trunk/core/Lucy/Analysis/Analyzer.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Analyzer.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Analyzer.cfh (original)
+++ lucy/trunk/core/Lucy/Analysis/Analyzer.cfh Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ parcel Lucy;
* (L<Normalizer|Lucy::Analysis::Normalizer>).
*/
public abstract class Lucy::Analysis::Analyzer
- inherits Lucy::Object::Obj : dumpable {
+ inherits Clownfish::Obj : dumpable {
public inert Analyzer*
init(Analyzer *self);
Modified: lucy/trunk/core/Lucy/Analysis/Inversion.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Inversion.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Inversion.cfh (original)
+++ lucy/trunk/core/Lucy/Analysis/Inversion.cfh Sun Jul 22 16:13:35 2012
@@ -22,7 +22,7 @@ parcel Lucy;
* An Inversion is a collection of Token objects which you can add to, then
* iterate over.
*/
-class Lucy::Analysis::Inversion inherits Lucy::Object::Obj {
+class Lucy::Analysis::Inversion inherits Clownfish::Obj {
Token **tokens;
uint32_t size;
Modified: lucy/trunk/core/Lucy/Analysis/Token.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Token.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Token.cfh (original)
+++ lucy/trunk/core/Lucy/Analysis/Token.cfh Sun Jul 22 16:13:35 2012
@@ -49,7 +49,7 @@ parcel Lucy;
* will end up assigned to positions 0, 1, and 1001 -- and will no longer
* produce a phrase match for the query <code>"three blind mice"</code>.
*/
-class Lucy::Analysis::Token inherits Lucy::Object::Obj {
+class Lucy::Analysis::Token inherits Clownfish::Obj {
char *text;
size_t len;
Modified: lucy/trunk/core/Lucy/Document/Doc.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Document/Doc.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Document/Doc.cfh (original)
+++ lucy/trunk/core/Lucy/Document/Doc.cfh Sun Jul 22 16:13:35 2012
@@ -22,7 +22,7 @@ parcel Lucy;
* or more fields, each of which has a value.
*/
-public class Lucy::Document::Doc inherits Lucy::Object::Obj
+public class Lucy::Document::Doc inherits Clownfish::Obj
: dumpable {
void *fields;
Modified: lucy/trunk/core/Lucy/Highlight/HeatMap.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Highlight/HeatMap.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Highlight/HeatMap.cfh (original)
+++ lucy/trunk/core/Lucy/Highlight/HeatMap.cfh Sun Jul 22 16:13:35 2012
@@ -22,7 +22,7 @@ parcel Lucy;
* "heat" (density) of relevant data in areas which match a search query.
*/
-class Lucy::Highlight::HeatMap inherits Lucy::Object::Obj {
+class Lucy::Highlight::HeatMap inherits Clownfish::Obj {
VArray *spans;
uint32_t window;
Modified: lucy/trunk/core/Lucy/Highlight/Highlighter.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Highlight/Highlighter.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Highlight/Highlighter.cfh (original)
+++ lucy/trunk/core/Lucy/Highlight/Highlighter.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* and phrases correctly and efficiently, using special-purpose data generated
* at index-time.
*/
-public class Lucy::Highlight::Highlighter inherits Lucy::Object::Obj {
+public class Lucy::Highlight::Highlighter inherits Clownfish::Obj {
Searcher *searcher;
Query *query;
Modified: lucy/trunk/core/Lucy/Index/BackgroundMerger.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/BackgroundMerger.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/BackgroundMerger.cfh (original)
+++ lucy/trunk/core/Lucy/Index/BackgroundMerger.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
* L<Lucy::Docs::FileLocking> if your index is on a shared volume.
*/
public class Lucy::Index::BackgroundMerger cnick BGMerger
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Schema *schema;
Folder *folder;
Modified: lucy/trunk/core/Lucy/Index/DataReader.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/DataReader.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/DataReader.cfh (original)
+++ lucy/trunk/core/Lucy/Index/DataReader.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* implement one of each.
*/
-public class Lucy::Index::DataReader inherits Lucy::Object::Obj {
+public class Lucy::Index::DataReader inherits Clownfish::Obj {
Schema *schema;
Folder *folder;
Modified: lucy/trunk/core/Lucy/Index/DataWriter.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/DataWriter.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/DataWriter.cfh (original)
+++ lucy/trunk/core/Lucy/Index/DataWriter.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
* L<Architecture|Lucy::Plan::Architecture>.
*/
-public class Lucy::Index::DataWriter inherits Lucy::Object::Obj {
+public class Lucy::Index::DataWriter inherits Clownfish::Obj {
Snapshot *snapshot;
Segment *segment;
Modified: lucy/trunk/core/Lucy/Index/DocVector.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/DocVector.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/DocVector.cfh (original)
+++ lucy/trunk/core/Lucy/Index/DocVector.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*/
class Lucy::Index::DocVector cnick DocVec
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Hash *field_bufs;
Hash *field_vectors;
Modified: lucy/trunk/core/Lucy/Index/FilePurger.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/FilePurger.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/FilePurger.cfh (original)
+++ lucy/trunk/core/Lucy/Index/FilePurger.cfh Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ parcel Lucy;
/** Delete obsolete index files.
*/
-class Lucy::Index::FilePurger inherits Lucy::Object::Obj {
+class Lucy::Index::FilePurger inherits Clownfish::Obj {
Folder *folder;
Snapshot *snapshot;
Modified: lucy/trunk/core/Lucy/Index/IndexManager.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/IndexManager.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/IndexManager.cfh (original)
+++ lucy/trunk/core/Lucy/Index/IndexManager.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
* defining rules which may change from process to process.
*/
public class Lucy::Index::IndexManager cnick IxManager
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Folder *folder;
CharBuf *host;
Modified: lucy/trunk/core/Lucy/Index/Indexer.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Indexer.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Indexer.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Indexer.cfh Sun Jul 22 16:13:35 2012
@@ -36,7 +36,7 @@ parcel Lucy;
* documents added this indexing session but not yet committed. This may
* change in a future update.
*/
-public class Lucy::Index::Indexer inherits Lucy::Object::Obj {
+public class Lucy::Index::Indexer inherits Clownfish::Obj {
Schema *schema;
Folder *folder;
Modified: lucy/trunk/core/Lucy/Index/Inverter.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Inverter.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Inverter.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Inverter.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* content when appropriate, and marshalling them into an iterable form.
*/
-class Lucy::Index::Inverter inherits Lucy::Object::Obj {
+class Lucy::Index::Inverter inherits Clownfish::Obj {
Schema *schema;
Segment *segment;
@@ -142,7 +142,7 @@ class Lucy::Index::Inverter inherits Luc
* field definitions are unchanging, we cache them in an InverterEntry object.
*/
private final class Lucy::Index::Inverter::InverterEntry cnick InvEntry
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
int32_t field_num;
CharBuf *field;
Modified: lucy/trunk/core/Lucy/Index/Lexicon.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Lexicon.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Lexicon.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Lexicon.cfh Sun Jul 22 16:13:35 2012
@@ -31,7 +31,7 @@ parcel Lucy;
* three
*/
-public class Lucy::Index::Lexicon cnick Lex inherits Lucy::Object::Obj {
+public class Lucy::Index::Lexicon cnick Lex inherits Clownfish::Obj {
CharBuf *field;
Modified: lucy/trunk/core/Lucy/Index/Segment.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Segment.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Segment.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Segment.cfh Sun Jul 22 16:13:35 2012
@@ -31,7 +31,7 @@ parcel Lucy;
* storing metadata themselves.
*/
-public class Lucy::Index::Segment cnick Seg inherits Lucy::Object::Obj {
+public class Lucy::Index::Segment cnick Seg inherits Clownfish::Obj {
CharBuf *name;
int64_t count;
Modified: lucy/trunk/core/Lucy/Index/Similarity.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Similarity.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Similarity.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Similarity.cfh Sun Jul 22 16:13:35 2012
@@ -34,7 +34,7 @@ parcel Lucy;
*/
public class Lucy::Index::Similarity cnick Sim
- inherits Lucy::Object::Obj : dumpable {
+ inherits Clownfish::Obj : dumpable {
float *norm_decoder;
Modified: lucy/trunk/core/Lucy/Index/Snapshot.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Snapshot.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Snapshot.cfh (original)
+++ lucy/trunk/core/Lucy/Index/Snapshot.cfh Sun Jul 22 16:13:35 2012
@@ -26,7 +26,7 @@ parcel Lucy;
* associated with a single Snapshot.
*/
-public class Lucy::Index::Snapshot inherits Lucy::Object::Obj : dumpable {
+public class Lucy::Index::Snapshot inherits Clownfish::Obj : dumpable {
Hash *entries;
CharBuf *path;
Modified: lucy/trunk/core/Lucy/Index/SortCache.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/SortCache.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/SortCache.cfh (original)
+++ lucy/trunk/core/Lucy/Index/SortCache.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Read a segment's sort caches.
*/
-class Lucy::Index::SortCache inherits Lucy::Object::Obj {
+class Lucy::Index::SortCache inherits Clownfish::Obj {
CharBuf *field;
FieldType *type;
Modified: lucy/trunk/core/Lucy/Index/TermInfo.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/TermInfo.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/TermInfo.cfh (original)
+++ lucy/trunk/core/Lucy/Index/TermInfo.cfh Sun Jul 22 16:13:35 2012
@@ -26,7 +26,7 @@ parcel Lucy;
* .lexx stream; it is a filepointer to a locations in the main .lex file.
*/
-class Lucy::Index::TermInfo cnick TInfo inherits Lucy::Object::Obj {
+class Lucy::Index::TermInfo cnick TInfo inherits Clownfish::Obj {
int32_t doc_freq;
int64_t post_filepos;
Modified: lucy/trunk/core/Lucy/Index/TermVector.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/TermVector.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/TermVector.cfh (original)
+++ lucy/trunk/core/Lucy/Index/TermVector.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*/
class Lucy::Index::TermVector cnick TV
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
CharBuf *field;
CharBuf *text;
Modified: lucy/trunk/core/Lucy/Object/BitVector.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/BitVector.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/BitVector.cfh (original)
+++ lucy/trunk/core/Lucy/Object/BitVector.cfh Sun Jul 22 16:13:35 2012
@@ -22,7 +22,7 @@ parcel Lucy;
*/
public class Lucy::Object::BitVector cnick BitVec
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
uint32_t cap;
uint8_t *bits;
Modified: lucy/trunk/core/Lucy/Object/I32Array.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Object/I32Array.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Object/I32Array.cfh (original)
+++ lucy/trunk/core/Lucy/Object/I32Array.cfh Sun Jul 22 16:13:35 2012
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Object::I32Array cnick I32Arr inherits Lucy::Object::Obj {
+class Lucy::Object::I32Array cnick I32Arr inherits Clownfish::Obj {
int32_t *ints;
uint32_t size;
Modified: lucy/trunk/core/Lucy/Plan/Architecture.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/Architecture.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/Architecture.cfh (original)
+++ lucy/trunk/core/Lucy/Plan/Architecture.cfh Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ parcel Lucy;
* L<SegWriter|Lucy::Index::SegWriter> and
* L<SegReader|Lucy::Index::SegReader>.
*/
-public class Lucy::Plan::Architecture cnick Arch inherits Lucy::Object::Obj {
+public class Lucy::Plan::Architecture cnick Arch inherits Clownfish::Obj {
public inert incremented Architecture*
new();
Modified: lucy/trunk/core/Lucy/Plan/FieldType.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/FieldType.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/FieldType.cfh (original)
+++ lucy/trunk/core/Lucy/Plan/FieldType.cfh Sun Jul 22 16:13:35 2012
@@ -70,7 +70,7 @@ __END_C__
* <code>indexed</code>.
*/
public abstract class Lucy::Plan::FieldType cnick FType
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
float boost;
bool_t indexed;
Modified: lucy/trunk/core/Lucy/Plan/Schema.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/Schema.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/Schema.cfh (original)
+++ lucy/trunk/core/Lucy/Plan/Schema.cfh Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ parcel Lucy;
* field definitions may not be changed. However, it is possible to add new
* fields during subsequent indexing sessions.
*/
-public class Lucy::Plan::Schema inherits Lucy::Object::Obj {
+public class Lucy::Plan::Schema inherits Clownfish::Obj {
Architecture *arch;
Similarity *sim;
Modified: lucy/trunk/core/Lucy/Search/Collector.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Collector.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Collector.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Collector.cfh Sun Jul 22 16:13:35 2012
@@ -29,7 +29,7 @@ parcel Lucy;
*/
public abstract class Lucy::Search::Collector cnick Coll
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
SegReader *reader;
Matcher *matcher;
Modified: lucy/trunk/core/Lucy/Search/Hits.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Hits.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Hits.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Hits.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*
* Hits objects are iterators used to access the results of a search.
*/
-public class Lucy::Search::Hits inherits Lucy::Object::Obj {
+public class Lucy::Search::Hits inherits Clownfish::Obj {
Searcher *searcher;
TopDocs *top_docs;
Modified: lucy/trunk/core/Lucy/Search/MatchDoc.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/MatchDoc.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/MatchDoc.cfh (original)
+++ lucy/trunk/core/Lucy/Search/MatchDoc.cfh Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ parcel Lucy;
/** Representation of a document being evaluated as a hit.
*/
-class Lucy::Search::MatchDoc inherits Lucy::Object::Obj {
+class Lucy::Search::MatchDoc inherits Clownfish::Obj {
int32_t doc_id;
float score;
Modified: lucy/trunk/core/Lucy/Search/Matcher.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Matcher.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Matcher.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Matcher.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* match. Other implementations may be match-only.
*/
-public abstract class Lucy::Search::Matcher inherits Lucy::Object::Obj {
+public abstract class Lucy::Search::Matcher inherits Clownfish::Obj {
/** Abstract constructor.
*/
Modified: lucy/trunk/core/Lucy/Search/Query.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Query.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Query.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Query.cfh Sun Jul 22 16:13:35 2012
@@ -34,7 +34,7 @@ parcel Lucy;
* can actually match and score documents.
*/
-public class Lucy::Search::Query inherits Lucy::Object::Obj : dumpable {
+public class Lucy::Search::Query inherits Clownfish::Obj : dumpable {
float boost;
Modified: lucy/trunk/core/Lucy/Search/QueryParser.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser.cfh (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser.cfh Sun Jul 22 16:13:35 2012
@@ -41,7 +41,7 @@ parcel Lucy;
*
*/
public class Lucy::Search::QueryParser cnick QParser
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Schema *schema;
Analyzer *analyzer;
Modified: lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser/ParserElem.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Private utility class.
*/
-class Lucy::Search::QueryParser::ParserElem inherits Lucy::Object::Obj {
+class Lucy::Search::QueryParser::ParserElem inherits Clownfish::Obj {
uint32_t type;
uint32_t occur;
Modified: lucy/trunk/core/Lucy/Search/QueryParser/QueryLexer.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/QueryParser/QueryLexer.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/QueryParser/QueryLexer.cfh (original)
+++ lucy/trunk/core/Lucy/Search/QueryParser/QueryLexer.cfh Sun Jul 22 16:13:35 2012
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Search::QueryParser::QueryLexer inherits Lucy::Object::Obj {
+class Lucy::Search::QueryParser::QueryLexer inherits Clownfish::Obj {
bool_t heed_colons;
Modified: lucy/trunk/core/Lucy/Search/Searcher.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Searcher.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Searcher.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Searcher.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* L<Lucy::Search::PolySearcher>.
*/
-public class Lucy::Search::Searcher inherits Lucy::Object::Obj {
+public class Lucy::Search::Searcher inherits Clownfish::Obj {
Schema *schema;
QueryParser *qparser;
Modified: lucy/trunk/core/Lucy/Search/SortRule.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/SortRule.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/SortRule.cfh (original)
+++ lucy/trunk/core/Lucy/Search/SortRule.cfh Sun Jul 22 16:13:35 2012
@@ -23,7 +23,7 @@ parcel Lucy;
* level of sorting. For example, sorting first by "category" then by score
* requires a SortSpec with two SortRule elements.
*/
-public class Lucy::Search::SortRule inherits Lucy::Object::Obj {
+public class Lucy::Search::SortRule inherits Clownfish::Obj {
int32_t type;
CharBuf *field;
Modified: lucy/trunk/core/Lucy/Search/SortSpec.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/SortSpec.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/SortSpec.cfh (original)
+++ lucy/trunk/core/Lucy/Search/SortSpec.cfh Sun Jul 22 16:13:35 2012
@@ -28,7 +28,7 @@ parcel Lucy;
* sort-by-doc rule as the last SortRule.
*/
-public class Lucy::Search::SortSpec inherits Lucy::Object::Obj {
+public class Lucy::Search::SortSpec inherits Clownfish::Obj {
VArray *rules;
Modified: lucy/trunk/core/Lucy/Search/Span.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/Span.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/Span.cfh (original)
+++ lucy/trunk/core/Lucy/Search/Span.cfh Sun Jul 22 16:13:35 2012
@@ -26,7 +26,7 @@ parcel Lucy;
* within an array of tokens, for example -- in which case the start and
* offset might be measured in token positions.
*/
-public class Lucy::Search::Span inherits Lucy::Object::Obj {
+public class Lucy::Search::Span inherits Clownfish::Obj {
int32_t offset;
int32_t length;
Modified: lucy/trunk/core/Lucy/Search/TopDocs.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/TopDocs.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/TopDocs.cfh (original)
+++ lucy/trunk/core/Lucy/Search/TopDocs.cfh Sun Jul 22 16:13:35 2012
@@ -21,7 +21,7 @@ parcel Lucy;
* A TopDocs object encapsulates the highest-scoring N documents and their
* associated scores.
*/
-class Lucy::Search::TopDocs inherits Lucy::Object::Obj {
+class Lucy::Search::TopDocs inherits Clownfish::Obj {
VArray *match_docs;
uint32_t total_hits;
Modified: lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh (original)
+++ lucy/trunk/core/Lucy/Store/CompoundFileWriter.cfh Sun Jul 22 16:13:35 2012
@@ -30,7 +30,7 @@ parcel Lucy;
*/
class Lucy::Store::CompoundFileWriter cnick CFWriter
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Folder *folder;
Modified: lucy/trunk/core/Lucy/Store/DirHandle.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/DirHandle.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/DirHandle.cfh (original)
+++ lucy/trunk/core/Lucy/Store/DirHandle.cfh Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ parcel Lucy;
/** Iterate over the files in a directory.
*/
abstract class Lucy::Store::DirHandle cnick DH
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
CharBuf *dir;
CharBuf *entry;
Modified: lucy/trunk/core/Lucy/Store/FileHandle.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/FileHandle.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/FileHandle.cfh (original)
+++ lucy/trunk/core/Lucy/Store/FileHandle.cfh Sun Jul 22 16:13:35 2012
@@ -33,7 +33,7 @@ parcel Lucy;
*/
abstract class Lucy::Store::FileHandle cnick FH
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
CharBuf *path;
uint32_t flags;
Modified: lucy/trunk/core/Lucy/Store/FileWindow.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/FileWindow.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/FileWindow.cfh (original)
+++ lucy/trunk/core/Lucy/Store/FileWindow.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** A portion of a file, viewed as an array of bytes.
*/
-class Lucy::Store::FileWindow inherits Lucy::Object::Obj {
+class Lucy::Store::FileWindow inherits Clownfish::Obj {
char *buf;
int64_t offset;
Modified: lucy/trunk/core/Lucy/Store/Folder.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/Folder.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/Folder.cfh (original)
+++ lucy/trunk/core/Lucy/Store/Folder.cfh Sun Jul 22 16:13:35 2012
@@ -26,7 +26,7 @@ parcel Lucy;
* L<FSFolder|Lucy::Store::FSFolder>, represents a directory on
* the file system holding a collection of files.
*/
-public abstract class Lucy::Store::Folder inherits Lucy::Object::Obj {
+public abstract class Lucy::Store::Folder inherits Clownfish::Obj {
CharBuf *path;
Hash *entries;
Modified: lucy/trunk/core/Lucy/Store/InStream.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/InStream.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/InStream.cfh (original)
+++ lucy/trunk/core/Lucy/Store/InStream.cfh Sun Jul 22 16:13:35 2012
@@ -31,7 +31,7 @@ parcel Lucy;
* practice is safe because InStreams do not modify or rely upon the file
* position or other state within the FileHandle.
*/
-class Lucy::Store::InStream inherits Lucy::Object::Obj {
+class Lucy::Store::InStream inherits Clownfish::Obj {
int64_t offset;
int64_t len;
Modified: lucy/trunk/core/Lucy/Store/Lock.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/Lock.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/Lock.cfh (original)
+++ lucy/trunk/core/Lucy/Store/Lock.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
* help clear away stale locks.
*/
-public abstract class Lucy::Store::Lock inherits Lucy::Object::Obj {
+public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
Folder *folder;
CharBuf *name;
Modified: lucy/trunk/core/Lucy/Store/LockFactory.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/LockFactory.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/LockFactory.cfh (original)
+++ lucy/trunk/core/Lucy/Store/LockFactory.cfh Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ parcel Lucy;
*/
public class Lucy::Store::LockFactory cnick LockFact
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
Folder *folder;
CharBuf *host;
Modified: lucy/trunk/core/Lucy/Store/OutStream.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/OutStream.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/OutStream.cfh (original)
+++ lucy/trunk/core/Lucy/Store/OutStream.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
* in order. Furthermore, each OutStream is associated with exactly one,
* unique FileHandle -- unlike InStreams, which can share a common FileHandle.
*/
-class Lucy::Store::OutStream inherits Lucy::Object::Obj {
+class Lucy::Store::OutStream inherits Clownfish::Obj {
char *buf;
int64_t buf_start;
Modified: lucy/trunk/core/Lucy/Store/RAMFile.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/RAMFile.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/RAMFile.cfh (original)
+++ lucy/trunk/core/Lucy/Store/RAMFile.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Backing storage used by RAMFolder and RAMFileHandle.
*/
-class Lucy::Store::RAMFile inherits Lucy::Object::Obj {
+class Lucy::Store::RAMFile inherits Clownfish::Obj {
bool_t read_only;
ByteBuf *contents;
Modified: lucy/trunk/core/Lucy/Test.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test.cfh (original)
+++ lucy/trunk/core/Lucy/Test.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*/
inert class Lucy::Test { }
-class Lucy::Test::TestBatch inherits Lucy::Object::Obj {
+class Lucy::Test::TestBatch inherits Clownfish::Obj {
int64_t test_num;
int64_t num_tests;
int64_t num_passed;
Modified: lucy/trunk/core/Lucy/Test/Object/TestByteBuf.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Object/TestByteBuf.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Object/TestByteBuf.cfh (original)
+++ lucy/trunk/core/Lucy/Test/Object/TestByteBuf.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
parcel Lucy;
class Lucy::Test::Object::TestByteBuf cnick TestBB
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
inert void
run_tests();
Modified: lucy/trunk/core/Lucy/Test/Object/TestCharBuf.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Object/TestCharBuf.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Object/TestCharBuf.cfh (original)
+++ lucy/trunk/core/Lucy/Test/Object/TestCharBuf.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
parcel Lucy;
class Lucy::Test::Object::TestCharBuf cnick TestCB
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
inert void
run_tests();
Modified: lucy/trunk/core/Lucy/Test/Search/TestQueryParser.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Search/TestQueryParser.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Search/TestQueryParser.cfh (original)
+++ lucy/trunk/core/Lucy/Test/Search/TestQueryParser.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*/
class Lucy::Test::Search::TestQueryParser cnick TestQP
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
CharBuf *query_string;
Query *tree;
Modified: lucy/trunk/core/Lucy/Util/Json.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json.cfh (original)
+++ lucy/trunk/core/Lucy/Util/Json.cfh Sun Jul 22 16:13:35 2012
@@ -20,7 +20,7 @@ parcel Lucy;
*
* Provides utility functions for encoding/decoding JSON.
*/
-class Lucy::Util::Json inherits Lucy::Object::Obj {
+class Lucy::Util::Json inherits Clownfish::Obj {
/** Encode <code>dump</code> as JSON. Returns NULL and sets Err_error on
* failure.
Modified: lucy/trunk/core/Lucy/Util/MemoryPool.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/MemoryPool.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/MemoryPool.cfh (original)
+++ lucy/trunk/core/Lucy/Util/MemoryPool.cfh Sun Jul 22 16:13:35 2012
@@ -27,7 +27,7 @@ parcel Lucy;
*/
class Lucy::Util::MemoryPool cnick MemPool
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
uint32_t arena_size;
VArray *arenas;
Modified: lucy/trunk/core/Lucy/Util/PriorityQueue.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/PriorityQueue.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/PriorityQueue.cfh (original)
+++ lucy/trunk/core/Lucy/Util/PriorityQueue.cfh Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ parcel Lucy;
*/
class Lucy::Util::PriorityQueue cnick PriQ
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
uint32_t size;
uint32_t max_size;
Modified: lucy/trunk/core/Lucy/Util/SortExternal.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/SortExternal.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortExternal.cfh (original)
+++ lucy/trunk/core/Lucy/Util/SortExternal.cfh Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@ parcel Lucy;
__C__
#include <stddef.h>
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Lucy/Util/SortUtils.h"
#define LUCY_SORTEX_DEFAULT_MEM_THRESHOLD 0x1000000
@@ -47,7 +47,7 @@ __END_C__
* single unified stream of sorted values.
*/
abstract class Lucy::Util::SortExternal cnick SortEx
- inherits Lucy::Object::Obj {
+ inherits Clownfish::Obj {
uint8_t *cache;
uint32_t cache_cap;
Modified: lucy/trunk/core/Lucy/Util/Stepper.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Stepper.cfh?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Stepper.cfh (original)
+++ lucy/trunk/core/Lucy/Util/Stepper.cfh Sun Jul 22 16:13:35 2012
@@ -35,7 +35,7 @@ parcel Lucy;
* logic of the class which calls Stepper_Read_Record.
*/
-class Lucy::Util::Stepper inherits Lucy::Object::Obj {
+class Lucy::Util::Stepper inherits Clownfish::Obj {
inert Stepper*
init(Stepper *self);
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Sun Jul 22 16:13:35 2012
@@ -36,7 +36,7 @@ extern "C" {
#include <stddef.h>
#include <stdlib.h>
#include <string.h>
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Lucy/Object/BitVector.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
Modified: lucy/trunk/example-lang/README
URL: http://svn.apache.org/viewvc/lucy/trunk/example-lang/README?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/example-lang/README (original)
+++ lucy/trunk/example-lang/README Sun Jul 22 16:13:35 2012
@@ -36,7 +36,7 @@ something similar to a free floating "st
search-related. At some point everything under Lucy::Object will probably
migrate to a new namespace:
- Lucy::Object::Obj => Clownfish::Obj
+ Clownfish::Obj => Clownfish::Obj
Lucy::Object::CharBuf => Clownfish::CharBuf
Lucy::Object::VArray => Clownfish::VArray
Lucy::Object::Hash => Clownfish::Hash
Modified: lucy/trunk/example-lang/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/example-lang/src/CFBind.h?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/example-lang/src/CFBind.h (original)
+++ lucy/trunk/example-lang/src/CFBind.h Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ extern "C" {
#endif
#include "charmony.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
Modified: lucy/trunk/perl/buildlib/Lucy/Build/Binding/Misc.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build/Binding/Misc.pm?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Misc.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Misc.pm Sun Jul 22 16:13:35 2012
@@ -58,7 +58,7 @@ to_perl(sv)
SV *sv;
CODE:
{
- if (sv_isobject(sv) && sv_derived_from(sv, "Lucy::Object::Obj")) {
+ if (sv_isobject(sv) && sv_derived_from(sv, "Clownfish::Obj")) {
IV tmp = SvIV(SvRV(sv));
lucy_Obj* obj = INT2PTR(lucy_Obj*, tmp);
RETVAL = XSBind_cfish_to_perl(obj);
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=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Object.pm Sun Jul 22 16:13:35 2012
@@ -545,7 +545,7 @@ sub bind_obj {
my $pod_spec = Clownfish::CFC::Binding::Perl::Pod->new;
my $synopsis = <<'END_SYNOPSIS';
package MyObj;
- use base qw( Lucy::Object::Obj );
+ use base qw( Clownfish::Obj );
# Inside-out member var.
my %foo;
@@ -571,12 +571,12 @@ sub bind_obj {
END_SYNOPSIS
my $description = <<'END_DESCRIPTION';
All objects in the Lucy:: hierarchy descend from
-Lucy::Object::Obj. All classes are implemented as blessed scalar
+Clownfish::Obj. All classes are implemented as blessed scalar
references, with the scalar storing a pointer to a C struct.
=head2 Subclassing
-The recommended way to subclass Lucy::Object::Obj and its descendants is
+The recommended way to subclass Clownfish::Obj and its descendants is
to use the inside-out design pattern. (See L<Class::InsideOut> for an
introduction to inside-out techniques.)
@@ -613,7 +613,7 @@ results in a segfault rather than an exc
=head2 new()
Abstract constructor -- must be invoked via a subclass. Attempting to
-instantiate objects of class "Lucy::Object::Obj" directly causes an
+instantiate objects of class "Clownfish::Obj" directly causes an
error.
Takes no arguments; if any are supplied, an error will be reported.
@@ -630,7 +630,7 @@ END_DESCRIPTION
$pod_spec->add_method( method => $_, alias => lc($_) ) for @exposed;
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Object::Obj
+MODULE = Lucy PACKAGE = Clownfish::Obj
chy_bool_t
is_a(self, class_name)
@@ -719,7 +719,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Object::Obj",
+ class_name => "Clownfish::Obj",
);
$binding->bind_method( alias => '_load', method => 'Load' );
$binding->exclude_method($_) for @hand_rolled;
Copied: lucy/trunk/perl/lib/Clownfish/Obj.pm (from r1364277, lucy/trunk/perl/lib/Lucy/Object/Obj.pm)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/Obj.pm?p2=lucy/trunk/perl/lib/Clownfish/Obj.pm&p1=lucy/trunk/perl/lib/Lucy/Object/Obj.pm&r1=1364277&r2=1364346&rev=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Object/Obj.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/Obj.pm Sun Jul 22 16:13:35 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Object::Obj;
+package Clownfish::Obj;
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=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Sun Jul 22 16:13:35 2012
@@ -131,7 +131,7 @@ sub error {$Clownfish::Err::error}
}
{
- package Lucy::Object::Obj;
+ package Clownfish::Obj;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
use Lucy qw( to_clownfish to_perl );
@@ -147,7 +147,7 @@ sub error {$Clownfish::Err::error}
my ( undef, $package ) = @_;
no strict 'refs';
for my $parent ( @{"$package\::ISA"} ) {
- return $parent if $parent->isa('Lucy::Object::Obj');
+ return $parent if $parent->isa('Clownfish::Obj');
}
return;
}
@@ -482,8 +482,8 @@ sub error {$Clownfish::Err::error}
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
BEGIN {
- if ( !__PACKAGE__->isa('Lucy::Object::Obj') ) {
- push our @ISA, 'Lucy::Object::Obj';
+ if ( !__PACKAGE__->isa('Clownfish::Obj') ) {
+ push our @ISA, 'Clownfish::Obj';
}
}
}
Modified: lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm (original)
+++ lucy/trunk/perl/lib/LucyX/Remote/SearchServer.pm Sun Jul 22 16:13:35 2012
@@ -17,7 +17,7 @@ use strict;
use warnings;
package LucyX::Remote::SearchServer;
-BEGIN { our @ISA = qw( Lucy::Object::Obj ) }
+BEGIN { our @ISA = qw( Clownfish::Obj ) }
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
use Carp;
Modified: lucy/trunk/perl/t/018-host.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/018-host.t?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/t/018-host.t (original)
+++ lucy/trunk/perl/t/018-host.t Sun Jul 22 16:13:35 2012
@@ -35,7 +35,7 @@ my %complex_data_structure = (
b => { foo => 'foofoo', bar => 'barbar' },
);
my $kobj = to_clownfish( \%complex_data_structure );
-isa_ok( $kobj, 'Lucy::Object::Obj' );
+isa_ok( $kobj, 'Clownfish::Obj' );
my $transformed = to_perl($kobj);
is_deeply( $transformed, \%complex_data_structure,
"transform from Perl to Clownfish data structures and back" );
Modified: lucy/trunk/perl/t/021-vtable.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/021-vtable.t?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/t/021-vtable.t (original)
+++ lucy/trunk/perl/t/021-vtable.t Sun Jul 22 16:13:35 2012
@@ -30,7 +30,7 @@ sub open_in {
}
package OnceRemoved;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
our $serialize_was_called = 0;
sub serialize {
Modified: lucy/trunk/perl/t/026-serialization.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/026-serialization.t?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/t/026-serialization.t (original)
+++ lucy/trunk/perl/t/026-serialization.t Sun Jul 22 16:13:35 2012
@@ -19,10 +19,10 @@ use warnings;
use Test::More tests => 7;
package BasicObj;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
package MyObj;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
my %extra;
Modified: lucy/trunk/perl/t/binding/019-obj.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/019-obj.t?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/019-obj.t (original)
+++ lucy/trunk/perl/t/binding/019-obj.t Sun Jul 22 16:13:35 2012
@@ -19,7 +19,7 @@ use warnings;
use Test::More tests => 18;
package TestObj;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
our $version = $Lucy::VERSION;
@@ -46,13 +46,13 @@ use base qw( TestObj );
}
package BadSerialize;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
{
sub serialize { }
}
package BadDump;
-use base qw( Lucy::Object::Obj );
+use base qw( Clownfish::Obj );
{
sub dump { }
}
@@ -66,10 +66,10 @@ ok( defined $TestObj::version,
);
my $object = TestObj->new;
-isa_ok( $object, "Lucy::Object::Obj",
+isa_ok( $object, "Clownfish::Obj",
"Clownfish objects can be subclassed outside the Lucy hierarchy" );
-ok( $object->is_a("Lucy::Object::Obj"), "custom is_a correct" );
+ok( $object->is_a("Clownfish::Obj"), "custom is_a correct" );
ok( !$object->is_a("Lucy::Object"), "custom is_a too long" );
ok( !$object->is_a("Lucy"), "custom is_a substring" );
ok( !$object->is_a(""), "custom is_a blank" );
Modified: lucy/trunk/perl/xs/Clownfish/Host.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Host.c?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/Host.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Host.c Sun Jul 22 16:13:35 2012
@@ -18,7 +18,7 @@
#include "Clownfish/VTable.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/Host.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
Copied: lucy/trunk/perl/xs/Clownfish/Obj.c (from r1364340, lucy/trunk/perl/xs/Lucy/Object/Obj.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Obj.c?p2=lucy/trunk/perl/xs/Clownfish/Obj.c&p1=lucy/trunk/perl/xs/Lucy/Object/Obj.c&r1=1364340&r2=1364346&rev=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Object/Obj.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Obj.c Sun Jul 22 16:13:35 2012
@@ -21,7 +21,7 @@
#include "XSUB.h"
#include "ppport.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
#include "Clownfish/VTable.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=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ lucy/trunk/perl/xs/Lucy/Document/Doc.c Sun Jul 22 16:13:35 2012
@@ -89,7 +89,7 @@ lucy_Doc_extract(lucy_Doc *self, lucy_Ch
if (sv_ptr && XSBind_sv_defined(*sv_ptr)) {
SV *const sv = *sv_ptr;
- if (sv_isobject(sv) && sv_derived_from(sv, "Lucy::Object::Obj")) {
+ if (sv_isobject(sv) && sv_derived_from(sv, "Clownfish::Obj")) {
IV tmp = SvIV(SvRV(sv));
retval = INT2PTR(lucy_Obj*, tmp);
}
Modified: lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.c?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.c (original)
+++ lucy/trunk/perl/xs/XSBind.c Sun Jul 22 16:13:35 2012
@@ -45,7 +45,7 @@ XSBind_new_blank_obj(SV *either_sv) {
// Get a VTable.
if (sv_isobject(either_sv)
- && sv_derived_from(either_sv, "Lucy::Object::Obj")
+ && sv_derived_from(either_sv, "Clownfish::Obj")
) {
// Use the supplied object's VTable.
IV iv_ptr = SvIV(SvRV(either_sv));
@@ -179,7 +179,7 @@ XSBind_perl_to_cfish(SV *sv) {
retval = (cfish_Obj*)S_perl_hash_to_cfish_hash((HV*)inner);
}
else if (sv_isobject(sv)
- && sv_derived_from(sv, "Lucy::Object::Obj")
+ && sv_derived_from(sv, "Clownfish::Obj")
) {
IV tmp = SvIV(inner);
retval = INT2PTR(cfish_Obj*, tmp);
Modified: lucy/trunk/perl/xs/XSBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.h?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.h (original)
+++ lucy/trunk/perl/xs/XSBind.h Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ extern "C" {
#endif
#include "charmony.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
Modified: lucy/trunk/ruby/src/CFBind.h
URL: http://svn.apache.org/viewvc/lucy/trunk/ruby/src/CFBind.h?rev=1364346&r1=1364345&r2=1364346&view=diff
==============================================================================
--- lucy/trunk/ruby/src/CFBind.h (original)
+++ lucy/trunk/ruby/src/CFBind.h Sun Jul 22 16:13:35 2012
@@ -25,7 +25,7 @@ extern "C" {
#endif
#include "charmony.h"
-#include "Lucy/Object/Obj.h"
+#include "Clownfish/Obj.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"