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/09/20 23:18:48 UTC
[lucy-commits] svn commit: r1388224 - in /lucy/trunk: clownfish/src/ core/Clownfish/
core/Clownfish/Util/ core/Lucy/Analysis/ core/Lucy/Highlight/
core/Lucy/Index/ core/Lucy/Index/Posting/ core/Lucy/Plan/ core/Lucy/Search/
core/Lucy/Store/ core/Lucy/Test/Store/ core/...
Author: marvin
Date: Thu Sep 20 21:18:46 2012
New Revision: 1388224
URL: http://svn.apache.org/viewvc?rev=1388224&view=rev
Log:
Move some util modules under Clownfish.
* Lucy::Util::Atomic => Clownfish::Util::Atomic
* Lucy::Util::Memory => Clownfish::Util::Memory
* Lucy::Util::NumberUtils => Clownfish::Util::NumberUtils
* Lucy::Util::SortUtils => Clownfish::Util::SortUtils
* Lucy::Util::StringHelper => Clownfish::Util::StringHelper
Added:
lucy/trunk/core/Clownfish/Util/
lucy/trunk/core/Clownfish/Util/Atomic.c
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/Atomic.c
lucy/trunk/core/Clownfish/Util/Atomic.cfh
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/Atomic.cfh
lucy/trunk/core/Clownfish/Util/Memory.c
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/Memory.c
lucy/trunk/core/Clownfish/Util/Memory.cfh
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/Memory.cfh
lucy/trunk/core/Clownfish/Util/NumberUtils.c
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/NumberUtils.c
lucy/trunk/core/Clownfish/Util/NumberUtils.cfh
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/NumberUtils.cfh
lucy/trunk/core/Clownfish/Util/SortUtils.c
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/SortUtils.c
lucy/trunk/core/Clownfish/Util/SortUtils.cfh
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/SortUtils.cfh
lucy/trunk/core/Clownfish/Util/StringHelper.c
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/StringHelper.c
lucy/trunk/core/Clownfish/Util/StringHelper.cfh
- copied, changed from r1388209, lucy/trunk/core/Lucy/Util/StringHelper.cfh
lucy/trunk/perl/lib/Clownfish/Util/
lucy/trunk/perl/lib/Clownfish/Util/StringHelper.pm
- copied, changed from r1388209, lucy/trunk/perl/lib/Lucy/Util/StringHelper.pm
Removed:
lucy/trunk/core/Lucy/Util/Atomic.c
lucy/trunk/core/Lucy/Util/Atomic.cfh
lucy/trunk/core/Lucy/Util/Memory.c
lucy/trunk/core/Lucy/Util/Memory.cfh
lucy/trunk/core/Lucy/Util/NumberUtils.c
lucy/trunk/core/Lucy/Util/NumberUtils.cfh
lucy/trunk/core/Lucy/Util/SortUtils.c
lucy/trunk/core/Lucy/Util/SortUtils.cfh
lucy/trunk/core/Lucy/Util/StringHelper.c
lucy/trunk/core/Lucy/Util/StringHelper.cfh
lucy/trunk/perl/lib/Lucy/Util/StringHelper.pm
Modified:
lucy/trunk/clownfish/src/CFCPerl.c
lucy/trunk/core/Clownfish/ByteBuf.c
lucy/trunk/core/Clownfish/CharBuf.c
lucy/trunk/core/Clownfish/Err.c
lucy/trunk/core/Clownfish/Hash.c
lucy/trunk/core/Clownfish/LockFreeRegistry.c
lucy/trunk/core/Clownfish/Obj.c
lucy/trunk/core/Clownfish/VArray.c
lucy/trunk/core/Clownfish/VArray.cfh
lucy/trunk/core/Clownfish/VTable.c
lucy/trunk/core/Lucy/Analysis/Inversion.c
lucy/trunk/core/Lucy/Highlight/HeatMap.c
lucy/trunk/core/Lucy/Index/IndexManager.c
lucy/trunk/core/Lucy/Index/PolyReader.c
lucy/trunk/core/Lucy/Index/Posting/RawPosting.c
lucy/trunk/core/Lucy/Index/PostingList.c
lucy/trunk/core/Lucy/Index/Segment.c
lucy/trunk/core/Lucy/Index/Snapshot.c
lucy/trunk/core/Lucy/Index/SortFieldWriter.c
lucy/trunk/core/Lucy/Index/SortWriter.c
lucy/trunk/core/Lucy/Index/TermInfo.c
lucy/trunk/core/Lucy/Index/TermStepper.c
lucy/trunk/core/Lucy/Plan/TextType.c
lucy/trunk/core/Lucy/Search/SortSpec.c
lucy/trunk/core/Lucy/Store/CompoundFileReader.c
lucy/trunk/core/Lucy/Test/Store/TestIOChunks.c
lucy/trunk/core/Lucy/Test/Store/TestIOPrimitives.c
lucy/trunk/core/Lucy/Test/Store/TestInStream.c
lucy/trunk/core/Lucy/Test/Util/TestAtomic.c
lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c
lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c
lucy/trunk/core/Lucy/Util/IndexFileNames.c
lucy/trunk/core/Lucy/Util/Json.c
lucy/trunk/core/Lucy/Util/SortExternal.cfh
lucy/trunk/core/Lucy/Util/ToolSet.h
lucy/trunk/perl/buildlib/Lucy/Build/Binding/Util.pm
lucy/trunk/perl/lib/Lucy.pm
lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm
lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm
lucy/trunk/perl/t/105-folder.t
lucy/trunk/perl/t/601-queryparser.t
lucy/trunk/perl/t/binding/101-simple_io.t
lucy/trunk/perl/xs/Clownfish/Host.c
lucy/trunk/perl/xs/Clownfish/Obj.c
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/Inverter.c
lucy/trunk/perl/xs/XSBind.c
Modified: lucy/trunk/clownfish/src/CFCPerl.c
URL: http://svn.apache.org/viewvc/lucy/trunk/clownfish/src/CFCPerl.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/clownfish/src/CFCPerl.c (original)
+++ lucy/trunk/clownfish/src/CFCPerl.c Thu Sep 20 21:18:46 2012
@@ -373,8 +373,8 @@ S_xs_file_contents(CFCPerl *self, const
"#include \"%s\"\n"
"\n"
"#include \"Clownfish/Host.h\"\n"
- "#include \"Lucy/Util/Memory.h\"\n"
- "#include \"Lucy/Util/StringHelper.h\"\n"
+ "#include \"Clownfish/Util/Memory.h\"\n"
+ "#include \"Clownfish/Util/StringHelper.h\"\n"
"\n"
"%s\n"
"\n"
Modified: lucy/trunk/core/Clownfish/ByteBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/ByteBuf.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/ByteBuf.c (original)
+++ lucy/trunk/core/Clownfish/ByteBuf.c Thu Sep 20 21:18:46 2012
@@ -29,7 +29,7 @@
#include "Clownfish/Err.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
static void
S_grow(ByteBuf *self, size_t size);
Modified: lucy/trunk/core/Clownfish/CharBuf.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/CharBuf.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/CharBuf.c (original)
+++ lucy/trunk/core/Clownfish/CharBuf.c Thu Sep 20 21:18:46 2012
@@ -31,8 +31,8 @@
#include "Clownfish/Err.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/Memory.h"
+#include "Clownfish/Util/StringHelper.h"
// Helper function for throwing invalid UTF-8 error. Since THROW uses
// a CharBuf internally, calling THROW with invalid UTF-8 would create an
Modified: lucy/trunk/core/Clownfish/Err.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Err.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Err.c (original)
+++ lucy/trunk/core/Clownfish/Err.c Thu Sep 20 21:18:46 2012
@@ -27,7 +27,7 @@
#include "Clownfish/Err.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/VTable.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
Err*
Err_new(CharBuf *mess) {
Modified: lucy/trunk/core/Clownfish/Hash.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Hash.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Hash.c (original)
+++ lucy/trunk/core/Clownfish/Hash.c Thu Sep 20 21:18:46 2012
@@ -31,7 +31,7 @@
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/Freezer.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
static HashTombStone *TOMBSTONE;
Modified: lucy/trunk/core/Clownfish/LockFreeRegistry.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/LockFreeRegistry.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/LockFreeRegistry.c (original)
+++ lucy/trunk/core/Clownfish/LockFreeRegistry.c Thu Sep 20 21:18:46 2012
@@ -21,8 +21,8 @@
#include "Clownfish/LockFreeRegistry.h"
#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
-#include "Lucy/Util/Atomic.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Atomic.h"
+#include "Clownfish/Util/Memory.h"
typedef struct lucy_LFRegEntry {
Obj *key;
Modified: lucy/trunk/core/Clownfish/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Obj.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/Obj.c (original)
+++ lucy/trunk/core/Clownfish/Obj.c Thu Sep 20 21:18:46 2012
@@ -30,7 +30,7 @@
#include "Clownfish/VTable.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
Obj*
Obj_init(Obj *self) {
Copied: lucy/trunk/core/Clownfish/Util/Atomic.c (from r1388209, lucy/trunk/core/Lucy/Util/Atomic.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/Atomic.c?p2=lucy/trunk/core/Clownfish/Util/Atomic.c&p1=lucy/trunk/core/Lucy/Util/Atomic.c&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Atomic.c (original)
+++ lucy/trunk/core/Clownfish/Util/Atomic.c Thu Sep 20 21:18:46 2012
@@ -16,7 +16,7 @@
#define C_LUCY_ATOMIC
#define LUCY_USE_SHORT_NAMES
-#include "Lucy/Util/Atomic.h"
+#include "Clownfish/Util/Atomic.h"
/********************************** Windows ********************************/
#ifdef CHY_HAS_WINDOWS_H
Copied: lucy/trunk/core/Clownfish/Util/Atomic.cfh (from r1388209, lucy/trunk/core/Lucy/Util/Atomic.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/Atomic.cfh?p2=lucy/trunk/core/Clownfish/Util/Atomic.cfh&p1=lucy/trunk/core/Lucy/Util/Atomic.cfh&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Atomic.cfh (original)
+++ lucy/trunk/core/Clownfish/Util/Atomic.cfh Thu Sep 20 21:18:46 2012
@@ -18,7 +18,7 @@ parcel Lucy;
/** Provide atomic memory operations.
*/
-inert class Lucy::Util::Atomic { }
+inert class Clownfish::Util::Atomic { }
__C__
Copied: lucy/trunk/core/Clownfish/Util/Memory.c (from r1388209, lucy/trunk/core/Lucy/Util/Memory.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/Memory.c?p2=lucy/trunk/core/Clownfish/Util/Memory.c&p1=lucy/trunk/core/Lucy/Util/Memory.c&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Memory.c (original)
+++ lucy/trunk/core/Clownfish/Util/Memory.c Thu Sep 20 21:18:46 2012
@@ -19,7 +19,7 @@
#include <stdio.h>
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
void*
Memory_wrapped_malloc(size_t count) {
Copied: lucy/trunk/core/Clownfish/Util/Memory.cfh (from r1388209, lucy/trunk/core/Lucy/Util/Memory.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/Memory.cfh?p2=lucy/trunk/core/Clownfish/Util/Memory.cfh&p1=lucy/trunk/core/Lucy/Util/Memory.cfh&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Memory.cfh (original)
+++ lucy/trunk/core/Clownfish/Util/Memory.cfh Thu Sep 20 21:18:46 2012
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class Lucy::Util::Memory {
+inert class Clownfish::Util::Memory {
/** Attempt to allocate memory with malloc, but print an error and exit if the
* call fails.
Copied: lucy/trunk/core/Clownfish/Util/NumberUtils.c (from r1388209, lucy/trunk/core/Lucy/Util/NumberUtils.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/NumberUtils.c?p2=lucy/trunk/core/Clownfish/Util/NumberUtils.c&p1=lucy/trunk/core/Lucy/Util/NumberUtils.c&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/NumberUtils.c (original)
+++ lucy/trunk/core/Clownfish/Util/NumberUtils.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include <string.h>
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/NumberUtils.h"
const uint8_t NumUtil_u1masks[8] = {
0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
Copied: lucy/trunk/core/Clownfish/Util/NumberUtils.cfh (from r1388209, lucy/trunk/core/Lucy/Util/NumberUtils.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/NumberUtils.cfh?p2=lucy/trunk/core/Clownfish/Util/NumberUtils.cfh&p1=lucy/trunk/core/Lucy/Util/NumberUtils.cfh&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/NumberUtils.cfh (original)
+++ lucy/trunk/core/Clownfish/Util/NumberUtils.cfh Thu Sep 20 21:18:46 2012
@@ -21,7 +21,7 @@ parcel Lucy;
* Provide utilities for dealing with endian issues, sub-byte-width arrays,
* compressed integers, and so on.
*/
-inert class Lucy::Util::NumberUtils cnick NumUtil {
+inert class Clownfish::Util::NumberUtils cnick NumUtil {
inert const uint8_t[8] u1masks;
inert const uint8_t[4] u2masks;
Copied: lucy/trunk/core/Clownfish/Util/SortUtils.c (from r1388209, lucy/trunk/core/Lucy/Util/SortUtils.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/SortUtils.c?p2=lucy/trunk/core/Clownfish/Util/SortUtils.c&p1=lucy/trunk/core/Lucy/Util/SortUtils.c&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortUtils.c (original)
+++ lucy/trunk/core/Clownfish/Util/SortUtils.c Thu Sep 20 21:18:46 2012
@@ -19,7 +19,7 @@
#define CHY_USE_SHORT_NAMES
#include <string.h>
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
#include "Clownfish/Err.h"
// Define four-byte and eight-byte types so that we can dereference void
Copied: lucy/trunk/core/Clownfish/Util/SortUtils.cfh (from r1388209, lucy/trunk/core/Lucy/Util/SortUtils.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/SortUtils.cfh?p2=lucy/trunk/core/Clownfish/Util/SortUtils.cfh&p1=lucy/trunk/core/Lucy/Util/SortUtils.cfh&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortUtils.cfh (original)
+++ lucy/trunk/core/Clownfish/Util/SortUtils.cfh Thu Sep 20 21:18:46 2012
@@ -29,7 +29,7 @@ __END_C__
*
* SortUtils also provides a quicksort with an additional context argument.
*/
-inert class Lucy::Util::SortUtils cnick Sort {
+inert class Clownfish::Util::SortUtils cnick Sort {
/** Perform a mergesort. In addition to providing a contiguous array of
* elements to be sorted and their count, the caller must also provide a
Copied: lucy/trunk/core/Clownfish/Util/StringHelper.c (from r1388209, lucy/trunk/core/Lucy/Util/StringHelper.c)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/StringHelper.c?p2=lucy/trunk/core/Clownfish/Util/StringHelper.c&p1=lucy/trunk/core/Lucy/Util/StringHelper.c&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/StringHelper.c (original)
+++ lucy/trunk/core/Clownfish/Util/StringHelper.c Thu Sep 20 21:18:46 2012
@@ -20,9 +20,9 @@
#define LUCY_USE_SHORT_NAMES
#define CHY_USE_SHORT_NAMES
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
#include "Clownfish/Err.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
const uint8_t lucy_StrHelp_UTF8_COUNT[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
Copied: lucy/trunk/core/Clownfish/Util/StringHelper.cfh (from r1388209, lucy/trunk/core/Lucy/Util/StringHelper.cfh)
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/Util/StringHelper.cfh?p2=lucy/trunk/core/Clownfish/Util/StringHelper.cfh&p1=lucy/trunk/core/Lucy/Util/StringHelper.cfh&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/StringHelper.cfh (original)
+++ lucy/trunk/core/Clownfish/Util/StringHelper.cfh Thu Sep 20 21:18:46 2012
@@ -16,7 +16,7 @@
parcel Lucy;
-inert class Lucy::Util::StringHelper cnick StrHelp {
+inert class Clownfish::Util::StringHelper cnick StrHelp {
/* A table where the values indicate the number of bytes in a UTF-8
* sequence implied by the leading utf8 byte.
Modified: lucy/trunk/core/Clownfish/VArray.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VArray.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VArray.c (original)
+++ lucy/trunk/core/Clownfish/VArray.c Thu Sep 20 21:18:46 2012
@@ -24,9 +24,9 @@
#include "Clownfish/VTable.h"
#include "Clownfish/VArray.h"
#include "Clownfish/Err.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
#include "Lucy/Util/Freezer.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
Modified: lucy/trunk/core/Clownfish/VArray.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VArray.cfh?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VArray.cfh (original)
+++ lucy/trunk/core/Clownfish/VArray.cfh Thu Sep 20 21:18:46 2012
@@ -17,7 +17,7 @@
parcel Lucy;
__C__
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
typedef chy_bool_t
(*Lucy_VA_Gather_Test_t)(lucy_VArray *self, uint32_t tick, void *data);
Modified: lucy/trunk/core/Clownfish/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Clownfish/VTable.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Clownfish/VTable.c (original)
+++ lucy/trunk/core/Clownfish/VTable.c Thu Sep 20 21:18:46 2012
@@ -32,8 +32,8 @@
#include "Clownfish/Method.h"
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"
-#include "Lucy/Util/Atomic.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Atomic.h"
+#include "Clownfish/Util/Memory.h"
size_t VTable_offset_of_parent = offsetof(VTable, parent);
Modified: lucy/trunk/core/Lucy/Analysis/Inversion.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Analysis/Inversion.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Analysis/Inversion.c (original)
+++ lucy/trunk/core/Lucy/Analysis/Inversion.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Lucy/Analysis/Inversion.h"
#include "Lucy/Analysis/Token.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
Modified: lucy/trunk/core/Lucy/Highlight/HeatMap.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Highlight/HeatMap.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Highlight/HeatMap.c (original)
+++ lucy/trunk/core/Lucy/Highlight/HeatMap.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Lucy/Highlight/HeatMap.h"
#include "Lucy/Search/Span.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
HeatMap*
HeatMap_new(VArray *spans, uint32_t window) {
Modified: lucy/trunk/core/Lucy/Index/IndexManager.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/IndexManager.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/IndexManager.c (original)
+++ lucy/trunk/core/Lucy/Index/IndexManager.c Thu Sep 20 21:18:46 2012
@@ -29,7 +29,7 @@
#include "Lucy/Store/LockFactory.h"
#include "Lucy/Util/IndexFileNames.h"
#include "Lucy/Util/Json.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
IndexManager*
IxManager_new(const CharBuf *host, LockFactory *lock_factory) {
Modified: lucy/trunk/core/Lucy/Index/PolyReader.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/PolyReader.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/PolyReader.c (original)
+++ lucy/trunk/core/Lucy/Index/PolyReader.c Thu Sep 20 21:18:46 2012
@@ -31,7 +31,7 @@
#include "Lucy/Store/Lock.h"
#include "Lucy/Util/Json.h"
#include "Lucy/Util/IndexFileNames.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
// Obtain/release read locks and commit locks.
static bool_t
Modified: lucy/trunk/core/Lucy/Index/Posting/RawPosting.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Posting/RawPosting.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Posting/RawPosting.c (original)
+++ lucy/trunk/core/Lucy/Index/Posting/RawPosting.c Thu Sep 20 21:18:46 2012
@@ -28,7 +28,7 @@
#include "Lucy/Index/TermInfo.h"
#include "Lucy/Plan/Schema.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
RawPosting*
RawPost_new(void *pre_allocated_memory, int32_t doc_id, uint32_t freq,
Modified: lucy/trunk/core/Lucy/Index/PostingList.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/PostingList.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/PostingList.c (original)
+++ lucy/trunk/core/Lucy/Index/PostingList.c Thu Sep 20 21:18:46 2012
@@ -22,7 +22,7 @@
#include "Lucy/Index/PostingList.h"
#include "Lucy/Index/Lexicon.h"
#include "Lucy/Index/Posting.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
PostingList*
PList_init(PostingList *self) {
Modified: lucy/trunk/core/Lucy/Index/Segment.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Segment.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Segment.c (original)
+++ lucy/trunk/core/Lucy/Index/Segment.c Thu Sep 20 21:18:46 2012
@@ -22,7 +22,7 @@
#include "Lucy/Index/Segment.h"
#include "Lucy/Store/Folder.h"
#include "Lucy/Util/Json.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
#include "Lucy/Util/IndexFileNames.h"
Segment*
Modified: lucy/trunk/core/Lucy/Index/Snapshot.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/Snapshot.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/Snapshot.c (original)
+++ lucy/trunk/core/Lucy/Index/Snapshot.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Lucy/Index/Snapshot.h"
#include "Lucy/Index/Segment.h"
#include "Lucy/Store/Folder.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
#include "Lucy/Util/IndexFileNames.h"
#include "Lucy/Util/Json.h"
Modified: lucy/trunk/core/Lucy/Index/SortFieldWriter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/SortFieldWriter.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/SortFieldWriter.c (original)
+++ lucy/trunk/core/Lucy/Index/SortFieldWriter.c Thu Sep 20 21:18:46 2012
@@ -34,9 +34,9 @@
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
#include "Lucy/Util/MemoryPool.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
// Prepare to read back a run.
static void
Modified: lucy/trunk/core/Lucy/Index/SortWriter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/SortWriter.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/SortWriter.c (original)
+++ lucy/trunk/core/Lucy/Index/SortWriter.c Thu Sep 20 21:18:46 2012
@@ -32,9 +32,9 @@
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
#include "Lucy/Util/MemoryPool.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
int32_t SortWriter_current_file_format = 3;
Modified: lucy/trunk/core/Lucy/Index/TermInfo.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/TermInfo.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/TermInfo.c (original)
+++ lucy/trunk/core/Lucy/Index/TermInfo.c Thu Sep 20 21:18:46 2012
@@ -18,7 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/TermInfo.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
TermInfo*
TInfo_new(int32_t doc_freq) {
Modified: lucy/trunk/core/Lucy/Index/TermStepper.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Index/TermStepper.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Index/TermStepper.c (original)
+++ lucy/trunk/core/Lucy/Index/TermStepper.c Thu Sep 20 21:18:46 2012
@@ -21,7 +21,7 @@
#include "Lucy/Plan/Schema.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
TermStepper*
TermStepper_init(TermStepper *self) {
Modified: lucy/trunk/core/Lucy/Plan/TextType.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Plan/TextType.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Plan/TextType.c (original)
+++ lucy/trunk/core/Lucy/Plan/TextType.c Thu Sep 20 21:18:46 2012
@@ -21,7 +21,7 @@
#include "Lucy/Plan/TextType.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
CharBuf*
TextType_make_blank(TextType *self) {
Modified: lucy/trunk/core/Lucy/Search/SortSpec.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Search/SortSpec.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Search/SortSpec.c (original)
+++ lucy/trunk/core/Lucy/Search/SortSpec.c Thu Sep 20 21:18:46 2012
@@ -25,7 +25,7 @@
#include "Lucy/Search/SortRule.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
SortSpec*
SortSpec_new(VArray *rules) {
Modified: lucy/trunk/core/Lucy/Store/CompoundFileReader.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Store/CompoundFileReader.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Store/CompoundFileReader.c (original)
+++ lucy/trunk/core/Lucy/Store/CompoundFileReader.c Thu Sep 20 21:18:46 2012
@@ -24,7 +24,7 @@
#include "Lucy/Store/InStream.h"
#include "Lucy/Util/IndexFileNames.h"
#include "Lucy/Util/Json.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
CompoundFileReader*
CFReader_open(Folder *folder) {
Modified: lucy/trunk/core/Lucy/Test/Store/TestIOChunks.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Store/TestIOChunks.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Store/TestIOChunks.c (original)
+++ lucy/trunk/core/Lucy/Test/Store/TestIOChunks.c Thu Sep 20 21:18:46 2012
@@ -28,7 +28,7 @@
#include "Lucy/Store/OutStream.h"
#include "Lucy/Store/RAMFile.h"
#include "Lucy/Store/RAMFileHandle.h"
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/NumberUtils.h"
static void
test_Align(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Test/Store/TestIOPrimitives.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Store/TestIOPrimitives.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Store/TestIOPrimitives.c (original)
+++ lucy/trunk/core/Lucy/Test/Store/TestIOPrimitives.c Thu Sep 20 21:18:46 2012
@@ -28,7 +28,7 @@
#include "Lucy/Store/OutStream.h"
#include "Lucy/Store/RAMFile.h"
#include "Lucy/Store/RAMFileHandle.h"
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/NumberUtils.h"
static void
test_i8(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Test/Store/TestInStream.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Store/TestInStream.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Store/TestInStream.c (original)
+++ lucy/trunk/core/Lucy/Test/Store/TestInStream.c Thu Sep 20 21:18:46 2012
@@ -28,7 +28,7 @@
#include "Lucy/Store/OutStream.h"
#include "Lucy/Store/RAMFile.h"
#include "Lucy/Store/RAMFileHandle.h"
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/NumberUtils.h"
static void
test_refill(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Test/Util/TestAtomic.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Util/TestAtomic.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Util/TestAtomic.c (original)
+++ lucy/trunk/core/Lucy/Test/Util/TestAtomic.c Thu Sep 20 21:18:46 2012
@@ -18,7 +18,7 @@
#include "Lucy/Test.h"
#include "Lucy/Test/Util/TestAtomic.h"
-#include "Lucy/Util/Atomic.h"
+#include "Clownfish/Util/Atomic.h"
static void
test_cas_ptr(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c (original)
+++ lucy/trunk/core/Lucy/Test/Util/TestNumberUtils.c Thu Sep 20 21:18:46 2012
@@ -22,7 +22,7 @@
#include "Lucy/Test.h"
#include "Lucy/Test/TestUtils.h"
#include "Lucy/Test/Util/TestNumberUtils.h"
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/NumberUtils.h"
static void
test_u1(TestBatch *batch) {
Modified: lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c (original)
+++ lucy/trunk/core/Lucy/Test/Util/TestStringHelper.c Thu Sep 20 21:18:46 2012
@@ -19,7 +19,7 @@
#include "Lucy/Test.h"
#include "Lucy/Test/Util/TestStringHelper.h"
#include "Lucy/Test/TestUtils.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
#include "utf8proc.h"
#include "Lucy/Util/Json.h"
Modified: lucy/trunk/core/Lucy/Util/IndexFileNames.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/IndexFileNames.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/IndexFileNames.c (original)
+++ lucy/trunk/core/Lucy/Util/IndexFileNames.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Lucy/Util/IndexFileNames.h"
#include "Lucy/Store/DirHandle.h"
#include "Lucy/Store/Folder.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
CharBuf*
IxFileNames_latest_snapshot(Folder *folder) {
Modified: lucy/trunk/core/Lucy/Util/Json.c
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/Json.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/Json.c (original)
+++ lucy/trunk/core/Lucy/Util/Json.c Thu Sep 20 21:18:46 2012
@@ -24,7 +24,7 @@
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
#include "Lucy/Util/Json/JsonParser.h"
/* Routines generated by Lemon. */
Modified: lucy/trunk/core/Lucy/Util/SortExternal.cfh
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/SortExternal.cfh?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/SortExternal.cfh (original)
+++ lucy/trunk/core/Lucy/Util/SortExternal.cfh Thu Sep 20 21:18:46 2012
@@ -19,7 +19,7 @@ parcel Lucy;
__C__
#include <stddef.h>
#include "Clownfish/Obj.h"
-#include "Lucy/Util/SortUtils.h"
+#include "Clownfish/Util/SortUtils.h"
#define LUCY_SORTEX_DEFAULT_MEM_THRESHOLD 0x1000000
#ifdef LUCY_USE_SHORT_NAMES
Modified: lucy/trunk/core/Lucy/Util/ToolSet.h
URL: http://svn.apache.org/viewvc/lucy/trunk/core/Lucy/Util/ToolSet.h?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/core/Lucy/Util/ToolSet.h (original)
+++ lucy/trunk/core/Lucy/Util/ToolSet.h Thu Sep 20 21:18:46 2012
@@ -46,9 +46,9 @@ extern "C" {
#include "Clownfish/Num.h"
#include "Clownfish/VArray.h"
#include "Clownfish/VTable.h"
-#include "Lucy/Util/NumberUtils.h"
-#include "Lucy/Util/Memory.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/NumberUtils.h"
+#include "Clownfish/Util/Memory.h"
+#include "Clownfish/Util/StringHelper.h"
#ifdef __cplusplus
}
Modified: lucy/trunk/perl/buildlib/Lucy/Build/Binding/Util.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/buildlib/Lucy/Build/Binding/Util.pm?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/buildlib/Lucy/Build/Binding/Util.pm (original)
+++ lucy/trunk/perl/buildlib/Lucy/Build/Binding/Util.pm Thu Sep 20 21:18:46 2012
@@ -189,7 +189,7 @@ sub bind_stepper {
sub bind_stringhelper {
my $xs_code = <<'END_XS_CODE';
-MODULE = Lucy PACKAGE = Lucy::Util::StringHelper
+MODULE = Lucy PACKAGE = Clownfish::Util::StringHelper
=for comment
@@ -281,7 +281,7 @@ END_XS_CODE
my $binding = Clownfish::CFC::Binding::Perl::Class->new(
parcel => "Lucy",
- class_name => "Lucy::Util::StringHelper",
+ class_name => "Clownfish::Util::StringHelper",
);
$binding->append_xs($xs_code);
Copied: lucy/trunk/perl/lib/Clownfish/Util/StringHelper.pm (from r1388209, lucy/trunk/perl/lib/Lucy/Util/StringHelper.pm)
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/Clownfish/Util/StringHelper.pm?p2=lucy/trunk/perl/lib/Clownfish/Util/StringHelper.pm&p1=lucy/trunk/perl/lib/Lucy/Util/StringHelper.pm&r1=1388209&r2=1388224&rev=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy/Util/StringHelper.pm (original)
+++ lucy/trunk/perl/lib/Clownfish/Util/StringHelper.pm Thu Sep 20 21:18:46 2012
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-package Lucy::Util::StringHelper;
+package Clownfish::Util::StringHelper;
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=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/lib/Lucy.pm (original)
+++ lucy/trunk/perl/lib/Lucy.pm Thu Sep 20 21:18:46 2012
@@ -62,7 +62,7 @@ sub error {$Clownfish::Err::error}
}
{
- package Lucy::Util::StringHelper;
+ package Clownfish::Util::StringHelper;
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
BEGIN {
Modified: lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm (original)
+++ lucy/trunk/perl/lib/LucyX/Index/ZlibDocReader.pm Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@ package LucyX::Index::ZlibDocReader;
use base qw( Lucy::Index::DocReader );
our $VERSION = '0.003000';
$VERSION = eval $VERSION;
-use Lucy::Util::StringHelper qw( utf8_valid utf8_flag_on );
+use Clownfish::Util::StringHelper qw( utf8_valid utf8_flag_on );
use Compress::Zlib qw( uncompress );
use Carp;
Modified: lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm (original)
+++ lucy/trunk/perl/lib/LucyX/Index/ZlibDocWriter.pm Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@ use base qw( Lucy::Index::DataWriter );
use Carp;
use Scalar::Util qw( blessed );
use Compress::Zlib qw( compress );
-use Lucy::Util::StringHelper qw( cat_bytes );
+use Clownfish::Util::StringHelper qw( cat_bytes );
use Lucy qw( to_perl );
use bytes;
no bytes;
Modified: lucy/trunk/perl/t/105-folder.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/105-folder.t?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/t/105-folder.t (original)
+++ lucy/trunk/perl/t/105-folder.t Thu Sep 20 21:18:46 2012
@@ -21,7 +21,7 @@ use Test::More tests => 25;
use File::Spec::Functions qw( catfile );
use Fcntl;
use Lucy::Test::TestUtils qw( init_test_index_loc );
-use Lucy::Util::StringHelper qw( to_base36 );
+use Clownfish::Util::StringHelper qw( to_base36 );
my $fs_index_loc = init_test_index_loc();
my $fs_folder = Lucy::Store::FSFolder->new( path => $fs_index_loc, );
Modified: lucy/trunk/perl/t/601-queryparser.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/601-queryparser.t?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/t/601-queryparser.t (original)
+++ lucy/trunk/perl/t/601-queryparser.t Thu Sep 20 21:18:46 2012
@@ -77,7 +77,7 @@ sub make_req_opt_query { shift; MyReqOpt
package main;
use Test::More tests => 224;
-use Lucy::Util::StringHelper qw( utf8_flag_on utf8ify );
+use Clownfish::Util::StringHelper qw( utf8_flag_on utf8ify );
use Lucy::Test::TestUtils qw( create_index );
my $folder = Lucy::Store::RAMFolder->new;
Modified: lucy/trunk/perl/t/binding/101-simple_io.t
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/t/binding/101-simple_io.t?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/t/binding/101-simple_io.t (original)
+++ lucy/trunk/perl/t/binding/101-simple_io.t Thu Sep 20 21:18:46 2012
@@ -19,7 +19,7 @@ use lib 'buildlib';
use Test::More tests => 28;
use Lucy::Test::TestUtils qw( utf8_test_strings );
-use Lucy::Util::StringHelper qw( utf8ify utf8_flag_off );
+use Clownfish::Util::StringHelper qw( utf8ify utf8_flag_off );
use bytes;
no bytes;
Modified: lucy/trunk/perl/xs/Clownfish/Host.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Host.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/Host.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Host.c Thu Sep 20 21:18:46 2012
@@ -22,7 +22,7 @@
#include "Clownfish/Host.h"
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
static SV*
S_do_callback_sv(void *vobj, const char *method, uint32_t num_args,
Modified: lucy/trunk/perl/xs/Clownfish/Obj.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/Obj.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/Obj.c (original)
+++ lucy/trunk/perl/xs/Clownfish/Obj.c Thu Sep 20 21:18:46 2012
@@ -25,7 +25,7 @@
#include "Clownfish/CharBuf.h"
#include "Clownfish/Err.h"
#include "Clownfish/VTable.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
static void
S_lazy_init_host_obj(lucy_Obj *self) {
Modified: lucy/trunk/perl/xs/Clownfish/VTable.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Clownfish/VTable.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Clownfish/VTable.c (original)
+++ lucy/trunk/perl/xs/Clownfish/VTable.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Clownfish/VTable.h"
#include "Clownfish/Host.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
lucy_Obj*
lucy_VTable_foster_obj(lucy_VTable *self, void *host_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=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c (original)
+++ lucy/trunk/perl/xs/Lucy/Analysis/RegexTokenizer.c Thu Sep 20 21:18:46 2012
@@ -22,8 +22,8 @@
#include "Lucy/Analysis/Token.h"
#include "Lucy/Analysis/Inversion.h"
#include "Clownfish/Host.h"
-#include "Lucy/Util/Memory.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/Memory.h"
+#include "Clownfish/Util/StringHelper.h"
static void
S_set_token_re_but_not_pattern(lucy_RegexTokenizer *self, void *token_re);
Modified: lucy/trunk/perl/xs/Lucy/Document/Doc.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Document/Doc.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Document/Doc.c (original)
+++ lucy/trunk/perl/xs/Lucy/Document/Doc.c Thu Sep 20 21:18:46 2012
@@ -20,7 +20,7 @@
#include "Clownfish/Host.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
-#include "Lucy/Util/Memory.h"
+#include "Clownfish/Util/Memory.h"
lucy_Doc*
lucy_Doc_init(lucy_Doc *self, void *fields, int32_t doc_id) {
Modified: lucy/trunk/perl/xs/Lucy/Index/Inverter.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/Lucy/Index/Inverter.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/Lucy/Index/Inverter.c (original)
+++ lucy/trunk/perl/xs/Lucy/Index/Inverter.c Thu Sep 20 21:18:46 2012
@@ -26,7 +26,7 @@
#include "Lucy/Plan/NumericType.h"
#include "Lucy/Plan/Schema.h"
#include "Lucy/Plan/TextType.h"
-#include "Lucy/Util/StringHelper.h"
+#include "Clownfish/Util/StringHelper.h"
static lucy_InverterEntry*
S_fetch_entry(lucy_Inverter *self, HE *hash_entry) {
Modified: lucy/trunk/perl/xs/XSBind.c
URL: http://svn.apache.org/viewvc/lucy/trunk/perl/xs/XSBind.c?rev=1388224&r1=1388223&r2=1388224&view=diff
==============================================================================
--- lucy/trunk/perl/xs/XSBind.c (original)
+++ lucy/trunk/perl/xs/XSBind.c Thu Sep 20 21:18:46 2012
@@ -17,8 +17,8 @@
#define C_LUCY_OBJ
#define NEED_newRV_noinc
#include "XSBind.h"
-#include "Lucy/Util/StringHelper.h"
-#include "Lucy/Util/NumberUtils.h"
+#include "Clownfish/Util/StringHelper.h"
+#include "Clownfish/Util/NumberUtils.h"
// Convert a Perl hash into a Clownfish Hash. Caller takes responsibility for
// a refcount.