lucy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nwelln...@apache.org
Subject [lucy-commits] [07/11] git commit: refs/heads/cfish-string-prep1 - Convert "const String" to "String"
Date Sat, 28 Sep 2013 17:33:07 GMT
Convert "const String" to "String"


Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/1929b635
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/1929b635
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/1929b635

Branch: refs/heads/cfish-string-prep1
Commit: 1929b635afa80999e68076b949beca04314748b6
Parents: 672419f
Author: Nick Wellnhofer <wellnhofer@aevum.de>
Authored: Sat Sep 28 17:18:57 2013 +0200
Committer: Nick Wellnhofer <wellnhofer@aevum.de>
Committed: Sat Sep 28 17:18:57 2013 +0200

----------------------------------------------------------------------
 c/src/Lucy/Analysis/RegexTokenizer.c            |  4 +-
 c/src/Lucy/Document/Doc.c                       |  2 +-
 clownfish/compiler/src/CFCPerlTypeMap.c         |  6 +--
 clownfish/runtime/c/src/Clownfish/VTable.c      |  4 +-
 clownfish/runtime/core/Clownfish/CharBuf.c      |  2 +-
 clownfish/runtime/core/Clownfish/CharBuf.cfh    |  2 +-
 clownfish/runtime/core/Clownfish/Err.c          |  2 +-
 clownfish/runtime/core/Clownfish/Err.cfh        |  2 +-
 clownfish/runtime/core/Clownfish/Method.c       |  4 +-
 clownfish/runtime/core/Clownfish/Method.cfh     |  4 +-
 clownfish/runtime/core/Clownfish/String.c       | 14 ++---
 clownfish/runtime/core/Clownfish/String.cfh     | 10 ++--
 clownfish/runtime/core/Clownfish/VTable.c       |  4 +-
 clownfish/runtime/core/Clownfish/VTable.cfh     |  8 +--
 .../perl/buildlib/Clownfish/Build/Binding.pm    |  6 +--
 clownfish/runtime/perl/xs/XSBind.c              |  6 +--
 clownfish/runtime/perl/xs/XSBind.h              |  2 +-
 clownfish/runtime/ruby/ext/Bind.c               |  2 +-
 clownfish/runtime/ruby/ext/Bind.h               |  2 +-
 core/Lucy/Analysis/EasyAnalyzer.c               |  4 +-
 core/Lucy/Analysis/EasyAnalyzer.cfh             |  4 +-
 core/Lucy/Analysis/Normalizer.c                 |  4 +-
 core/Lucy/Analysis/Normalizer.cfh               |  4 +-
 core/Lucy/Analysis/PolyAnalyzer.c               |  4 +-
 core/Lucy/Analysis/PolyAnalyzer.cfh             |  4 +-
 core/Lucy/Analysis/RegexTokenizer.c             |  2 +-
 core/Lucy/Analysis/RegexTokenizer.cfh           |  4 +-
 core/Lucy/Analysis/SnowballStemmer.c            |  4 +-
 core/Lucy/Analysis/SnowballStemmer.cfh          |  4 +-
 core/Lucy/Analysis/SnowballStopFilter.c         |  6 +--
 core/Lucy/Analysis/SnowballStopFilter.cfh       |  6 +--
 core/Lucy/Document/Doc.cfh                      |  2 +-
 core/Lucy/Highlight/Highlighter.c               | 12 ++---
 core/Lucy/Highlight/Highlighter.cfh             | 12 ++---
 core/Lucy/Index/BitVecDelDocs.c                 |  4 +-
 core/Lucy/Index/BitVecDelDocs.cfh               |  4 +-
 core/Lucy/Index/DeletionsWriter.c               |  4 +-
 core/Lucy/Index/DeletionsWriter.cfh             |  8 +--
 core/Lucy/Index/DocVector.c                     | 12 ++---
 core/Lucy/Index/DocVector.cfh                   |  6 +--
 core/Lucy/Index/IndexManager.c                  |  6 +--
 core/Lucy/Index/IndexManager.cfh                |  6 +--
 core/Lucy/Index/IndexReader.c                   |  4 +-
 core/Lucy/Index/IndexReader.cfh                 |  4 +-
 core/Lucy/Index/Inverter.c                      |  4 +-
 core/Lucy/Index/Inverter.cfh                    |  4 +-
 core/Lucy/Index/LexIndex.c                      |  4 +-
 core/Lucy/Index/LexIndex.cfh                    |  4 +-
 core/Lucy/Index/Lexicon.c                       |  2 +-
 core/Lucy/Index/Lexicon.cfh                     |  2 +-
 core/Lucy/Index/LexiconReader.c                 | 12 ++---
 core/Lucy/Index/LexiconReader.cfh               | 16 +++---
 core/Lucy/Index/LexiconWriter.c                 |  2 +-
 core/Lucy/Index/LexiconWriter.cfh               |  2 +-
 core/Lucy/Index/PolyLexicon.c                   |  4 +-
 core/Lucy/Index/PolyLexicon.cfh                 |  4 +-
 core/Lucy/Index/PolyReader.c                    |  4 +-
 core/Lucy/Index/PostingListReader.c             |  2 +-
 core/Lucy/Index/PostingListReader.cfh           |  4 +-
 core/Lucy/Index/PostingPool.c                   |  4 +-
 core/Lucy/Index/PostingPool.cfh                 |  4 +-
 core/Lucy/Index/RawLexicon.c                    |  4 +-
 core/Lucy/Index/RawLexicon.cfh                  |  4 +-
 core/Lucy/Index/RawPostingList.c                |  4 +-
 core/Lucy/Index/RawPostingList.cfh              |  4 +-
 core/Lucy/Index/SegLexicon.c                    |  4 +-
 core/Lucy/Index/SegLexicon.cfh                  |  4 +-
 core/Lucy/Index/SegPostingList.c                |  4 +-
 core/Lucy/Index/SegPostingList.cfh              |  4 +-
 core/Lucy/Index/SegReader.c                     |  2 +-
 core/Lucy/Index/SegReader.cfh                   |  2 +-
 core/Lucy/Index/SegWriter.c                     |  4 +-
 core/Lucy/Index/SegWriter.cfh                   |  4 +-
 core/Lucy/Index/Segment.c                       | 10 ++--
 core/Lucy/Index/Segment.cfh                     | 10 ++--
 core/Lucy/Index/Snapshot.c                      | 10 ++--
 core/Lucy/Index/Snapshot.cfh                    | 10 ++--
 core/Lucy/Index/SortCache.c                     |  2 +-
 core/Lucy/Index/SortCache.cfh                   |  2 +-
 core/Lucy/Index/SortCache/NumericSortCache.c    | 18 +++----
 core/Lucy/Index/SortCache/NumericSortCache.cfh  | 18 +++----
 core/Lucy/Index/SortCache/TextSortCache.c       |  4 +-
 core/Lucy/Index/SortCache/TextSortCache.cfh     |  4 +-
 core/Lucy/Index/SortFieldWriter.c               |  4 +-
 core/Lucy/Index/SortFieldWriter.cfh             |  4 +-
 core/Lucy/Index/SortReader.c                    |  4 +-
 core/Lucy/Index/SortReader.cfh                  |  4 +-
 core/Lucy/Index/TermVector.c                    |  4 +-
 core/Lucy/Index/TermVector.cfh                  |  4 +-
 core/Lucy/Plan/Schema.c                         | 26 +++++-----
 core/Lucy/Plan/Schema.cfh                       | 10 ++--
 core/Lucy/Search/Compiler.c                     |  2 +-
 core/Lucy/Search/Compiler.cfh                   |  2 +-
 core/Lucy/Search/IndexSearcher.c                |  2 +-
 core/Lucy/Search/IndexSearcher.cfh              |  2 +-
 core/Lucy/Search/LeafQuery.c                    |  4 +-
 core/Lucy/Search/LeafQuery.cfh                  |  4 +-
 core/Lucy/Search/NOTQuery.c                     |  2 +-
 core/Lucy/Search/NOTQuery.cfh                   |  2 +-
 core/Lucy/Search/PhraseQuery.c                  |  6 +--
 core/Lucy/Search/PhraseQuery.cfh                |  6 +--
 core/Lucy/Search/PolyQuery.c                    |  2 +-
 core/Lucy/Search/PolyQuery.cfh                  |  2 +-
 core/Lucy/Search/PolySearcher.c                 |  2 +-
 core/Lucy/Search/PolySearcher.cfh               |  2 +-
 core/Lucy/Search/QueryParser.c                  | 14 ++---
 core/Lucy/Search/QueryParser.cfh                | 12 ++---
 core/Lucy/Search/QueryParser/QueryLexer.c       |  2 +-
 core/Lucy/Search/QueryParser/QueryLexer.cfh     |  2 +-
 core/Lucy/Search/RangeQuery.c                   |  6 +--
 core/Lucy/Search/RangeQuery.cfh                 |  4 +-
 core/Lucy/Search/Searcher.cfh                   |  2 +-
 core/Lucy/Search/SortRule.c                     |  4 +-
 core/Lucy/Search/SortRule.cfh                   |  4 +-
 core/Lucy/Search/TermQuery.c                    |  6 +--
 core/Lucy/Search/TermQuery.cfh                  |  6 +--
 core/Lucy/Store/CompoundFileReader.c            | 16 +++---
 core/Lucy/Store/CompoundFileReader.cfh          | 16 +++---
 core/Lucy/Store/DirHandle.c                     |  2 +-
 core/Lucy/Store/DirHandle.cfh                   |  2 +-
 core/Lucy/Store/FSDirHandle.c                   |  6 +--
 core/Lucy/Store/FSDirHandle.cfh                 |  4 +-
 core/Lucy/Store/FSFileHandle.c                  |  4 +-
 core/Lucy/Store/FSFileHandle.cfh                |  4 +-
 core/Lucy/Store/FSFolder.c                      | 54 ++++++++++----------
 core/Lucy/Store/FSFolder.cfh                    | 20 ++++----
 core/Lucy/Store/FileHandle.c                    |  4 +-
 core/Lucy/Store/FileHandle.cfh                  |  4 +-
 core/Lucy/Store/Folder.c                        | 38 +++++++-------
 core/Lucy/Store/Folder.cfh                      | 52 +++++++++----------
 core/Lucy/Store/InStream.c                      |  2 +-
 core/Lucy/Store/InStream.cfh                    |  2 +-
 core/Lucy/Store/Lock.c                          | 12 ++---
 core/Lucy/Store/Lock.cfh                        | 12 ++---
 core/Lucy/Store/LockFactory.c                   |  8 +--
 core/Lucy/Store/LockFactory.cfh                 |  8 +--
 core/Lucy/Store/RAMFileHandle.c                 |  4 +-
 core/Lucy/Store/RAMFileHandle.cfh               |  4 +-
 core/Lucy/Store/RAMFolder.c                     | 30 +++++------
 core/Lucy/Store/RAMFolder.cfh                   | 20 ++++----
 core/Lucy/Store/SharedLock.c                    |  6 +--
 core/Lucy/Store/SharedLock.cfh                  |  6 +--
 core/Lucy/Test/Store/MockFileHandle.c           |  4 +-
 core/Lucy/Test/Store/MockFileHandle.cfh         |  4 +-
 core/Lucy/Util/IndexFileNames.c                 |  4 +-
 core/Lucy/Util/IndexFileNames.cfh               |  4 +-
 core/Lucy/Util/Json.c                           |  4 +-
 core/Lucy/Util/Json.cfh                         |  4 +-
 core/LucyX/Search/ProximityQuery.c              |  6 +--
 core/LucyX/Search/ProximityQuery.cfh            |  6 +--
 perl/buildlib/Lucy/Build/Binding/Util.pm        |  2 +-
 perl/xs/Lucy/Analysis/RegexTokenizer.c          |  6 +--
 perl/xs/Lucy/Document/Doc.c                     |  2 +-
 153 files changed, 487 insertions(+), 491 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/c/src/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Analysis/RegexTokenizer.c b/c/src/Lucy/Analysis/RegexTokenizer.c
index 62085cb..b3d7a6a 100644
--- a/c/src/Lucy/Analysis/RegexTokenizer.c
+++ b/c/src/Lucy/Analysis/RegexTokenizer.c
@@ -44,7 +44,7 @@ RegexTokenizer_is_available(void) {
 }
 
 RegexTokenizer*
-RegexTokenizer_init(RegexTokenizer *self, const String *pattern) {
+RegexTokenizer_init(RegexTokenizer *self, String *pattern) {
     Analyzer_init((Analyzer*)self);
     RegexTokenizerIVARS *const ivars = RegexTokenizer_IVARS(self);
 
@@ -167,7 +167,7 @@ RegexTokenizer_is_available(void) {
 }
 
 RegexTokenizer*
-RegexTokenizer_init(RegexTokenizer *self, const String *pattern) {
+RegexTokenizer_init(RegexTokenizer *self, String *pattern) {
     UNUSED_VAR(self);
     UNUSED_VAR(pattern);
     THROW(ERR,

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/c/src/Lucy/Document/Doc.c
----------------------------------------------------------------------
diff --git a/c/src/Lucy/Document/Doc.c b/c/src/Lucy/Document/Doc.c
index 4aa129c..bc6c85b 100644
--- a/c/src/Lucy/Document/Doc.c
+++ b/c/src/Lucy/Document/Doc.c
@@ -61,7 +61,7 @@ Doc_Get_Size_IMP(Doc *self) {
 }
 
 void
-Doc_Store_IMP(Doc *self, const String *field, Obj *value) {
+Doc_Store_IMP(Doc *self, String *field, Obj *value) {
     Hash *hash = (Hash*)Doc_IVARS(self)->fields;
     Hash_Store(hash, (Obj *)field, INCREF(value));
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/compiler/src/CFCPerlTypeMap.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/src/CFCPerlTypeMap.c b/clownfish/compiler/src/CFCPerlTypeMap.c
index 32fbc53..4553a13 100644
--- a/clownfish/compiler/src/CFCPerlTypeMap.c
+++ b/clownfish/compiler/src/CFCPerlTypeMap.c
@@ -211,8 +211,7 @@ static const char typemap_start[] =
     "uint16_t\tCFISH_UNSIGNED_INT\n"
     "uint32_t\tCFISH_UNSIGNED_INT\n"
     "uint64_t\tCFISH_BIG_UNSIGNED_INT\n"
-    "\n"
-    "const cfish_String*\tCONST_CHARBUF\n";
+    "\n";
 
 
 static const char typemap_input[] =
@@ -232,9 +231,6 @@ static const char typemap_input[] =
     "\n"
     "CFISH_BIG_UNSIGNED_INT \n"
     "    $var = (sizeof(UV) == 8) ? ($type)SvUV($arg) : ($type)SvNV($arg);\n"
-    "\n"
-    "CONST_CHARBUF\n"
-    "    $var = (const cfish_String*)CFISH_SSTR_WRAP_UTF8(SvPVutf8_nolen($arg), SvCUR($arg));\n"
     "\n";
 
 static const char typemap_output[] =

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/c/src/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/c/src/Clownfish/VTable.c b/clownfish/runtime/c/src/Clownfish/VTable.c
index ac822db..5617900 100644
--- a/clownfish/runtime/c/src/Clownfish/VTable.c
+++ b/clownfish/runtime/c/src/Clownfish/VTable.c
@@ -58,13 +58,13 @@ VTable_register_with_host(VTable *singleton, VTable *parent) {
 }
 
 VArray*
-VTable_fresh_host_methods(const String *class_name) {
+VTable_fresh_host_methods(String *class_name) {
     UNUSED_VAR(class_name);
     return VA_new(0);
 }
 
 String*
-VTable_find_parent_class(const String *class_name) {
+VTable_find_parent_class(String *class_name) {
     UNUSED_VAR(class_name);
     THROW(ERR, "TODO");
     UNREACHABLE_RETURN(String*);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/CharBuf.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/CharBuf.c b/clownfish/runtime/core/Clownfish/CharBuf.c
index ea056b8..893d0f5 100644
--- a/clownfish/runtime/core/Clownfish/CharBuf.c
+++ b/clownfish/runtime/core/Clownfish/CharBuf.c
@@ -382,7 +382,7 @@ CB_Cat_Trusted_Utf8_IMP(CharBuf *self, const char* ptr, size_t size) {
 }
 
 void
-CB_Cat_IMP(CharBuf *self, const String *string) {
+CB_Cat_IMP(CharBuf *self, String *string) {
     const size_t new_size = self->size + string->size;
     if (new_size >= self->cap) {
         size_t amount = Memory_oversize(new_size, sizeof(char));

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/CharBuf.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/CharBuf.cfh b/clownfish/runtime/core/Clownfish/CharBuf.cfh
index 34c23c3..77a6e32 100644
--- a/clownfish/runtime/core/Clownfish/CharBuf.cfh
+++ b/clownfish/runtime/core/Clownfish/CharBuf.cfh
@@ -80,7 +80,7 @@ class Clownfish::CharBuf cnick CB
      * caller.
      */
     void
-    Cat(CharBuf *self, const String *string);
+    Cat(CharBuf *self, String *string);
 
     /** Concatenate formatted arguments.  Similar to the printf family, but
      * only accepts minimal options (just enough for decent error messages).

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/Err.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Err.c b/clownfish/runtime/core/Clownfish/Err.c
index 30199a3..b642358 100644
--- a/clownfish/runtime/core/Clownfish/Err.c
+++ b/clownfish/runtime/core/Clownfish/Err.c
@@ -57,7 +57,7 @@ Err_To_String_IMP(Err *self) {
 }
 
 void
-Err_Cat_Mess_IMP(Err *self, const String *mess) {
+Err_Cat_Mess_IMP(Err *self, String *mess) {
     String *new_mess = Str_Cat(self->mess, mess);
     DECREF(self->mess);
     self->mess = new_mess;

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/Err.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Err.cfh b/clownfish/runtime/core/Clownfish/Err.cfh
index 3f47e4f..348e0ed 100644
--- a/clownfish/runtime/core/Clownfish/Err.cfh
+++ b/clownfish/runtime/core/Clownfish/Err.cfh
@@ -61,7 +61,7 @@ public class Clownfish::Err inherits Clownfish::Obj {
     /** Concatenate the supplied argument onto the internal "mess".
      */
     public void
-    Cat_Mess(Err *self, const String *mess);
+    Cat_Mess(Err *self, String *mess);
 
     public String*
     Get_Mess(Err *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/Method.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Method.c b/clownfish/runtime/core/Clownfish/Method.c
index 9f4bddd..e7a72e5 100644
--- a/clownfish/runtime/core/Clownfish/Method.c
+++ b/clownfish/runtime/core/Clownfish/Method.c
@@ -26,13 +26,13 @@
 #include "Clownfish/VTable.h"
 
 Method*
-Method_new(const String *name, cfish_method_t callback_func, size_t offset) {
+Method_new(String *name, cfish_method_t callback_func, size_t offset) {
     Method *self = (Method*)VTable_Make_Obj(METHOD);
     return Method_init(self, name, callback_func, offset);
 }
 
 Method*
-Method_init(Method *self, const String *name, cfish_method_t callback_func,
+Method_init(Method *self, String *name, cfish_method_t callback_func,
             size_t offset) {
     self->name          = Str_Clone(name);
     self->host_alias    = NULL;

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/Method.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/Method.cfh b/clownfish/runtime/core/Clownfish/Method.cfh
index 521839c..4f73384 100644
--- a/clownfish/runtime/core/Clownfish/Method.cfh
+++ b/clownfish/runtime/core/Clownfish/Method.cfh
@@ -28,10 +28,10 @@ class Clownfish::Method inherits Clownfish::Obj {
     bool            is_excluded;
 
     inert Method*
-    new(const String *name, cfish_method_t callback_func, size_t offset);
+    new(String *name, cfish_method_t callback_func, size_t offset);
 
     inert Method*
-    init(Method *self, const String *name, cfish_method_t callback_func,
+    init(Method *self, String *name, cfish_method_t callback_func,
          size_t offset);
 
     String*

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/String.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/String.c b/clownfish/runtime/core/Clownfish/String.c
index b2c2c97..f8337d7 100644
--- a/clownfish/runtime/core/Clownfish/String.c
+++ b/clownfish/runtime/core/Clownfish/String.c
@@ -317,7 +317,7 @@ Str_Clone_IMP(String *self) {
 }
 
 String*
-Str_Cat_IMP(String *self, const String *other) {
+Str_Cat_IMP(String *self, String *other) {
     return Str_Cat_Trusted_Utf8(self, other->ptr, other->size);
 }
 
@@ -341,7 +341,7 @@ Str_Cat_Trusted_Utf8_IMP(String *self, const char* ptr, size_t size) {
 }
 
 bool
-Str_Starts_With_IMP(String *self, const String *prefix) {
+Str_Starts_With_IMP(String *self, String *prefix) {
     return Str_Starts_With_Utf8_IMP(self, prefix->ptr, prefix->size);
 }
 
@@ -380,7 +380,7 @@ Str_Equals_Utf8_IMP(String *self, const char *ptr, size_t size) {
 }
 
 bool
-Str_Ends_With_IMP(String *self, const String *postfix) {
+Str_Ends_With_IMP(String *self, String *postfix) {
     return Str_Ends_With_Utf8_IMP(self, postfix->ptr, postfix->size);
 }
 
@@ -397,7 +397,7 @@ Str_Ends_With_Utf8_IMP(String *self, const char *postfix, size_t postfix_len) {
 }
 
 int64_t
-Str_Find_IMP(String *self, const String *substring) {
+Str_Find_IMP(String *self, String *substring) {
     return Str_Find_Utf8(self, substring->ptr, substring->size);
 }
 
@@ -483,8 +483,8 @@ Str_SubString_IMP(String *self, size_t offset, size_t len) {
 
 int
 Str_compare(const void *va, const void *vb) {
-    const String *a = *(const String**)va;
-    const String *b = *(const String**)vb;
+    String *a = *(String**)va;
+    String *b = *(String**)vb;
     size_t min_size;
     int    tie;
 
@@ -571,7 +571,7 @@ SStr_wrap_str(void *allocation, const char *ptr, size_t size) {
 }
 
 StackString*
-SStr_wrap(void *allocation, const String *source) {
+SStr_wrap(void *allocation, String *source) {
     return SStr_wrap_str(allocation, source->ptr, source->size);
 }
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/String.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/String.cfh b/clownfish/runtime/core/Clownfish/String.cfh
index b66bbf5..4d18706 100644
--- a/clownfish/runtime/core/Clownfish/String.cfh
+++ b/clownfish/runtime/core/Clownfish/String.cfh
@@ -113,7 +113,7 @@ class Clownfish::String cnick Str
     /** Return the concatenation of the String and <code>other</code>.
      */
     incremented String*
-    Cat(String *self, const String *other);
+    Cat(String *self, String *other);
 
     /** Return the concatenation of the String and the passed-in raw UTF-8.
      */
@@ -147,7 +147,7 @@ class Clownfish::String cnick Str
     /** Test whether the String starts with the content of another.
      */
     bool
-    Starts_With(String *self, const String *prefix);
+    Starts_With(String *self, String *prefix);
 
     /** Test whether the String starts with the passed-in string.
      */
@@ -157,7 +157,7 @@ class Clownfish::String cnick Str
     /** Test whether the String ends with the content of another.
      */
     bool
-    Ends_With(String *self, const String *postfix);
+    Ends_With(String *self, String *postfix);
 
     /** Test whether the String ends with the passed-in string.
      */
@@ -168,7 +168,7 @@ class Clownfish::String cnick Str
      * code points), or -1 if the substring does not match.
      */
     int64_t
-    Find(String *self, const String *substring);
+    Find(String *self, String *substring);
 
     int64_t
     Find_Utf8(String *self, const char *ptr, size_t size);
@@ -293,7 +293,7 @@ class Clownfish::StackString cnick SStr
     new_from_str(void *allocation, size_t alloc_size, String *string);
 
     inert incremented StackString*
-    wrap(void *allocation, const String *source);
+    wrap(void *allocation, String *source);
 
     inert incremented StackString*
     wrap_str(void *allocation, const char *ptr, size_t size);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/VTable.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/VTable.c b/clownfish/runtime/core/Clownfish/VTable.c
index 71c6800..fe6d718 100644
--- a/clownfish/runtime/core/Clownfish/VTable.c
+++ b/clownfish/runtime/core/Clownfish/VTable.c
@@ -248,7 +248,7 @@ VTable_init_registry() {
 }
 
 VTable*
-VTable_singleton(const String *class_name, VTable *parent) {
+VTable_singleton(String *class_name, VTable *parent) {
     if (VTable_registry == NULL) {
         VTable_init_registry();
     }
@@ -381,7 +381,7 @@ VTable_add_alias_to_registry(VTable *vtable, const char *alias_ptr,
 }
 
 VTable*
-VTable_fetch_vtable(const String *class_name) {
+VTable_fetch_vtable(String *class_name) {
     VTable *vtable = NULL;
     if (VTable_registry != NULL) {
         vtable = (VTable*)LFReg_Fetch(VTable_registry, (Obj*)class_name);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/core/Clownfish/VTable.cfh
----------------------------------------------------------------------
diff --git a/clownfish/runtime/core/Clownfish/VTable.cfh b/clownfish/runtime/core/Clownfish/VTable.cfh
index 11d1669..97e5cf6 100644
--- a/clownfish/runtime/core/Clownfish/VTable.cfh
+++ b/clownfish/runtime/core/Clownfish/VTable.cfh
@@ -49,7 +49,7 @@ class Clownfish::VTable inherits Clownfish::Obj {
      * result.
      */
     inert VTable*
-    singleton(const String *class_name, VTable *parent);
+    singleton(String *class_name, VTable *parent);
 
     /** Register a vtable, so that it can be retrieved by class name.
      *
@@ -78,18 +78,18 @@ class Clownfish::VTable inherits Clownfish::Obj {
      * class is not registered.
      */
     inert nullable VTable*
-    fetch_vtable(const String *class_name);
+    fetch_vtable(String *class_name);
 
     /** Given a class name, return the name of a parent class which descends
      * from Clownfish::Obj, or NULL if such a class can't be found.
      */
     inert nullable String*
-    find_parent_class(const String *class_name);
+    find_parent_class(String *class_name);
 
     /** List all of the methods defined directly within a host subclass.
      */
     inert incremented VArray*
-    fresh_host_methods(const String *class_name);
+    fresh_host_methods(String *class_name);
 
     /** Replace a function pointer in the VTable.
      */

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
index 494febe..d61718d 100644
--- a/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
+++ b/clownfish/runtime/perl/buildlib/Clownfish/Build/Binding.pm
@@ -248,7 +248,7 @@ MODULE = Clownfish    PACKAGE = Clownfish::Hash
 SV*
 _fetch(self, key)
     cfish_Hash *self;
-    const cfish_String *key;
+    cfish_String *key;
 CODE:
     RETVAL = CFISH_OBJ_TO_SV(CFISH_Hash_Fetch_IMP(self, (cfish_Obj*)key));
 OUTPUT: RETVAL
@@ -256,7 +256,7 @@ OUTPUT: RETVAL
 void
 store(self, key, value);
     cfish_Hash         *self;
-    const cfish_String *key;
+    cfish_String *key;
     cfish_Obj          *value;
 PPCODE:
 {
@@ -454,7 +454,7 @@ MODULE = Clownfish     PACKAGE = Clownfish::Obj
 bool
 is_a(self, class_name)
     cfish_Obj *self;
-    const cfish_String *class_name;
+    cfish_String *class_name;
 CODE:
 {
     cfish_VTable *target = cfish_VTable_fetch_vtable(class_name);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/perl/xs/XSBind.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/xs/XSBind.c b/clownfish/runtime/perl/xs/XSBind.c
index d3a8e84..47d5e90 100644
--- a/clownfish/runtime/perl/xs/XSBind.c
+++ b/clownfish/runtime/perl/xs/XSBind.c
@@ -225,7 +225,7 @@ XSBind_bb_to_sv(const cfish_ByteBuf *bb) {
 }
 
 SV*
-XSBind_str_to_sv(const cfish_String *str) {
+XSBind_str_to_sv(cfish_String *str) {
     if (!str) {
         return newSV(0);
     }
@@ -715,7 +715,7 @@ cfish_VTable_register_with_host(cfish_VTable *singleton, cfish_VTable *parent) {
 }
 
 cfish_VArray*
-cfish_VTable_fresh_host_methods(const cfish_String *class_name) {
+cfish_VTable_fresh_host_methods(cfish_String *class_name) {
     dSP;
     ENTER;
     SAVETMPS;
@@ -733,7 +733,7 @@ cfish_VTable_fresh_host_methods(const cfish_String *class_name) {
 }
 
 cfish_String*
-cfish_VTable_find_parent_class(const cfish_String *class_name) {
+cfish_VTable_find_parent_class(cfish_String *class_name) {
     dSP;
     ENTER;
     SAVETMPS;

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/perl/xs/XSBind.h
----------------------------------------------------------------------
diff --git a/clownfish/runtime/perl/xs/XSBind.h b/clownfish/runtime/perl/xs/XSBind.h
index 851422b..01c6d6c 100644
--- a/clownfish/runtime/perl/xs/XSBind.h
+++ b/clownfish/runtime/perl/xs/XSBind.h
@@ -133,7 +133,7 @@ cfish_XSBind_bb_to_sv(const cfish_ByteBuf *bb);
 /** Convert a String into a new UTF-8 string SV.
  */
 CFISH_VISIBLE SV*
-cfish_XSBind_str_to_sv(const cfish_String *str);
+cfish_XSBind_str_to_sv(cfish_String *str);
 
 /** Perl-specific wrapper for Err#trap.  The "routine" must be either a
  * subroutine reference or the name of a subroutine.

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/ruby/ext/Bind.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/ruby/ext/Bind.c b/clownfish/runtime/ruby/ext/Bind.c
index 9fa2fbd..e44737b 100644
--- a/clownfish/runtime/ruby/ext/Bind.c
+++ b/clownfish/runtime/ruby/ext/Bind.c
@@ -30,7 +30,7 @@ Bind_cfish_to_ruby(cfish_Obj *obj) {
 }
 
 VALUE
-Bind_str_to_ruby(const cfish_String *str) {
+Bind_str_to_ruby(cfish_String *str) {
     if (!str) {
         return rb_str_new2("");
     }

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/clownfish/runtime/ruby/ext/Bind.h
----------------------------------------------------------------------
diff --git a/clownfish/runtime/ruby/ext/Bind.h b/clownfish/runtime/ruby/ext/Bind.h
index cf6a2b1..805afae 100644
--- a/clownfish/runtime/ruby/ext/Bind.h
+++ b/clownfish/runtime/ruby/ext/Bind.h
@@ -35,7 +35,7 @@ extern "C" {
 #include "Clownfish/VTable.h"
 
 VALUE Bind_cfish_to_ruby(cfish_Obj *obj);
-VALUE Bind_str_to_ruby(const cfish_String *str);
+VALUE Bind_str_to_ruby(cfish_String *str);
 static VALUE S_cfish_array_to_ruby_array(cfish_VArray *varray);
 
 #ifdef __cplusplus

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/EasyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.c b/core/Lucy/Analysis/EasyAnalyzer.c
index 136dca9..27413ed 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.c
+++ b/core/Lucy/Analysis/EasyAnalyzer.c
@@ -24,13 +24,13 @@
 #include "Lucy/Analysis/SnowballStemmer.h"
 
 EasyAnalyzer*
-EasyAnalyzer_new(const String *language) {
+EasyAnalyzer_new(String *language) {
     EasyAnalyzer *self = (EasyAnalyzer*)VTable_Make_Obj(EASYANALYZER);
     return EasyAnalyzer_init(self, language);
 }
 
 EasyAnalyzer*
-EasyAnalyzer_init(EasyAnalyzer *self, const String *language) {
+EasyAnalyzer_init(EasyAnalyzer *self, String *language) {
     Analyzer_init((Analyzer*)self);
     EasyAnalyzerIVARS *const ivars = EasyAnalyzer_IVARS(self);
     ivars->language   = Str_Clone(language);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/EasyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.cfh b/core/Lucy/Analysis/EasyAnalyzer.cfh
index e56db82..905f914 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.cfh
+++ b/core/Lucy/Analysis/EasyAnalyzer.cfh
@@ -49,13 +49,13 @@ public class Lucy::Analysis::EasyAnalyzer inherits Lucy::Analysis::Analyzer {
     SnowballStemmer *stemmer;
 
     inert incremented EasyAnalyzer*
-    new(const String *language = NULL);
+    new(String *language = NULL);
 
     /**
      * @param language An ISO code from the list of supported languages.
      */
     public inert EasyAnalyzer*
-    init(EasyAnalyzer *self, const String *language = NULL);
+    init(EasyAnalyzer *self, String *language = NULL);
 
     public incremented Inversion*
     Transform(EasyAnalyzer *self, Inversion *inversion);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/Normalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.c b/core/Lucy/Analysis/Normalizer.c
index c022f5f..945bfad 100644
--- a/core/Lucy/Analysis/Normalizer.c
+++ b/core/Lucy/Analysis/Normalizer.c
@@ -28,13 +28,13 @@
 #define INITIAL_BUFSIZE 63
 
 Normalizer*
-Normalizer_new(const String *form, bool case_fold, bool strip_accents) {
+Normalizer_new(String *form, bool case_fold, bool strip_accents) {
     Normalizer *self = (Normalizer*)VTable_Make_Obj(NORMALIZER);
     return Normalizer_init(self, form, case_fold, strip_accents);
 }
 
 Normalizer*
-Normalizer_init(Normalizer *self, const String *form, bool case_fold,
+Normalizer_init(Normalizer *self, String *form, bool case_fold,
                 bool strip_accents) {
     int options = UTF8PROC_STABLE;
     NormalizerIVARS *const ivars = Normalizer_IVARS(self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/Normalizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.cfh b/core/Lucy/Analysis/Normalizer.cfh
index 4787e14..f46ee63 100644
--- a/core/Lucy/Analysis/Normalizer.cfh
+++ b/core/Lucy/Analysis/Normalizer.cfh
@@ -32,7 +32,7 @@ public class Lucy::Analysis::Normalizer inherits Lucy::Analysis::Analyzer {
     int options;
 
     inert incremented Normalizer*
-    new(const String *normalization_form = NULL, bool case_fold = true,
+    new(String *normalization_form = NULL, bool case_fold = true,
         bool strip_accents = false);
 
     /**
@@ -42,7 +42,7 @@ public class Lucy::Analysis::Normalizer inherits Lucy::Analysis::Analyzer {
      * @param strip_accents Strip accents, default is false.
      */
     public inert Normalizer*
-    init(Normalizer *self, const String *normalization_form = NULL,
+    init(Normalizer *self, String *normalization_form = NULL,
         bool case_fold = true, bool strip_accents = false);
 
     public incremented Inversion*

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/PolyAnalyzer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.c b/core/Lucy/Analysis/PolyAnalyzer.c
index 92dd9bf..cdb1bff 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.c
+++ b/core/Lucy/Analysis/PolyAnalyzer.c
@@ -26,13 +26,13 @@
 #include "Lucy/Util/Freezer.h"
 
 PolyAnalyzer*
-PolyAnalyzer_new(const String *language, VArray *analyzers) {
+PolyAnalyzer_new(String *language, VArray *analyzers) {
     PolyAnalyzer *self = (PolyAnalyzer*)VTable_Make_Obj(POLYANALYZER);
     return PolyAnalyzer_init(self, language, analyzers);
 }
 
 PolyAnalyzer*
-PolyAnalyzer_init(PolyAnalyzer *self, const String *language,
+PolyAnalyzer_init(PolyAnalyzer *self, String *language,
                   VArray *analyzers) {
     Analyzer_init((Analyzer*)self);
     PolyAnalyzerIVARS *const ivars = PolyAnalyzer_IVARS(self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/PolyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.cfh b/core/Lucy/Analysis/PolyAnalyzer.cfh
index 88fd693..5108259 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.cfh
+++ b/core/Lucy/Analysis/PolyAnalyzer.cfh
@@ -52,7 +52,7 @@ public class Lucy::Analysis::PolyAnalyzer inherits Lucy::Analysis::Analyzer {
     VArray  *analyzers;
 
     inert incremented PolyAnalyzer*
-    new(const String *language = NULL, VArray *analyzers = NULL);
+    new(String *language = NULL, VArray *analyzers = NULL);
 
     /**
      * @param language An ISO code from the list of supported languages.
@@ -65,7 +65,7 @@ public class Lucy::Analysis::PolyAnalyzer inherits Lucy::Analysis::Analyzer {
      * stopalize, stem.
      */
     public inert PolyAnalyzer*
-    init(PolyAnalyzer *self, const String *language = NULL,
+    init(PolyAnalyzer *self, String *language = NULL,
          VArray *analyzers = NULL);
 
     /** Getter for "analyzers" member.

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/RegexTokenizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.c b/core/Lucy/Analysis/RegexTokenizer.c
index 07215a5..2859c9f 100644
--- a/core/Lucy/Analysis/RegexTokenizer.c
+++ b/core/Lucy/Analysis/RegexTokenizer.c
@@ -23,7 +23,7 @@
 #include "Lucy/Analysis/Inversion.h"
 
 RegexTokenizer*
-RegexTokenizer_new(const String *pattern) {
+RegexTokenizer_new(String *pattern) {
     RegexTokenizer *self = (RegexTokenizer*)VTable_Make_Obj(REGEXTOKENIZER);
     return RegexTokenizer_init(self, pattern);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/RegexTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.cfh b/core/Lucy/Analysis/RegexTokenizer.cfh
index a4bde3c..66590a4 100644
--- a/core/Lucy/Analysis/RegexTokenizer.cfh
+++ b/core/Lucy/Analysis/RegexTokenizer.cfh
@@ -60,7 +60,7 @@ public class Lucy::Analysis::RegexTokenizer
     is_available();
 
     inert incremented RegexTokenizer*
-    new(const String *pattern = NULL);
+    new(String *pattern = NULL);
 
     /**
      * @param pattern A string specifying a Perl-syntax regular expression
@@ -69,7 +69,7 @@ public class Lucy::Analysis::RegexTokenizer
      * "it" and "O'Henry's" as well as "Henry".
      */
     public inert RegexTokenizer*
-    init(RegexTokenizer *self, const String *pattern = NULL);
+    init(RegexTokenizer *self, String *pattern = NULL);
 
     public incremented Inversion*
     Transform(RegexTokenizer *self, Inversion *inversion);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/SnowballStemmer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.c b/core/Lucy/Analysis/SnowballStemmer.c
index 955d2fc..2266515 100644
--- a/core/Lucy/Analysis/SnowballStemmer.c
+++ b/core/Lucy/Analysis/SnowballStemmer.c
@@ -26,13 +26,13 @@
 #include "libstemmer.h"
 
 SnowballStemmer*
-SnowStemmer_new(const String *language) {
+SnowStemmer_new(String *language) {
     SnowballStemmer *self = (SnowballStemmer*)VTable_Make_Obj(SNOWBALLSTEMMER);
     return SnowStemmer_init(self, language);
 }
 
 SnowballStemmer*
-SnowStemmer_init(SnowballStemmer *self, const String *language) {
+SnowStemmer_init(SnowballStemmer *self, String *language) {
     char lang_buf[3];
     Analyzer_init((Analyzer*)self);
     SnowballStemmerIVARS *const ivars = SnowStemmer_IVARS(self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/SnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.cfh b/core/Lucy/Analysis/SnowballStemmer.cfh
index d622c83..83912da 100644
--- a/core/Lucy/Analysis/SnowballStemmer.cfh
+++ b/core/Lucy/Analysis/SnowballStemmer.cfh
@@ -32,14 +32,14 @@ public class Lucy::Analysis::SnowballStemmer cnick SnowStemmer
     String *language;
 
     inert incremented SnowballStemmer*
-    new(const String *language);
+    new(String *language);
 
     /**
      * @param language A two-letter ISO code identifying a language supported
      * by Snowball.
      */
     public inert SnowballStemmer*
-    init(SnowballStemmer *self, const String *language);
+    init(SnowballStemmer *self, String *language);
 
     public incremented Inversion*
     Transform(SnowballStemmer *self, Inversion *inversion);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/SnowballStopFilter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.c b/core/Lucy/Analysis/SnowballStopFilter.c
index f4c995e..efae12d 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.c
+++ b/core/Lucy/Analysis/SnowballStopFilter.c
@@ -25,13 +25,13 @@
 #include "Lucy/Util/Freezer.h"
 
 SnowballStopFilter*
-SnowStop_new(const String *language, Hash *stoplist) {
+SnowStop_new(String *language, Hash *stoplist) {
     SnowballStopFilter *self = (SnowballStopFilter*)VTable_Make_Obj(SNOWBALLSTOPFILTER);
     return SnowStop_init(self, language, stoplist);
 }
 
 SnowballStopFilter*
-SnowStop_init(SnowballStopFilter *self, const String *language,
+SnowStop_init(SnowballStopFilter *self, String *language,
               Hash *stoplist) {
     Analyzer_init((Analyzer*)self);
     SnowballStopFilterIVARS *const ivars = SnowStop_IVARS(self);
@@ -118,7 +118,7 @@ SnowStop_Load_IMP(SnowballStopFilter *self, Obj *dump) {
 }
 
 Hash*
-SnowStop_gen_stoplist(const String *language) {
+SnowStop_gen_stoplist(String *language) {
     char lang[2];
     lang[0] = tolower(Str_Code_Point_At(language, 0));
     lang[1] = tolower(Str_Code_Point_At(language, 1));

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Analysis/SnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.cfh b/core/Lucy/Analysis/SnowballStopFilter.cfh
index df008aa..cf573bd 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.cfh
+++ b/core/Lucy/Analysis/SnowballStopFilter.cfh
@@ -74,20 +74,20 @@ public class Lucy::Analysis::SnowballStopFilter cnick SnowStop
     inert const uint8_t** snow_sv;
 
     inert incremented SnowballStopFilter*
-    new(const String *language = NULL, Hash *stoplist = NULL);
+    new(String *language = NULL, Hash *stoplist = NULL);
 
     /**
      * @param stoplist A hash with stopwords as the keys.
      * @param language The ISO code for a supported language.
      */
     public inert SnowballStopFilter*
-    init(SnowballStopFilter *self, const String *language = NULL,
+    init(SnowballStopFilter *self, String *language = NULL,
          Hash *stoplist = NULL);
 
     /** Return a Hash with the Snowball stoplist for the supplied language.
      */
     inert incremented Hash*
-    gen_stoplist(const String *language);
+    gen_stoplist(String *language);
 
     public incremented Inversion*
     Transform(SnowballStopFilter *self, Inversion *inversion);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Document/Doc.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/Doc.cfh b/core/Lucy/Document/Doc.cfh
index 973f249..003b2c3 100644
--- a/core/Lucy/Document/Doc.cfh
+++ b/core/Lucy/Document/Doc.cfh
@@ -51,7 +51,7 @@ public class Lucy::Document::Doc inherits Clownfish::Obj {
     /** Store a field value in the Doc.
      */
     void
-    Store(Doc *self, const String *field, Obj *value);
+    Store(Doc *self, String *field, Obj *value);
 
     /** Set the doc's field's attribute.
      */

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Highlight/Highlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.c b/core/Lucy/Highlight/Highlighter.c
index c384b46..2353b11 100644
--- a/core/Lucy/Highlight/Highlighter.c
+++ b/core/Lucy/Highlight/Highlighter.c
@@ -45,7 +45,7 @@ static String*
 S_encode_entities(String *text, CharBuf *encoded);
 
 Highlighter*
-Highlighter_new(Searcher *searcher, Obj *query, const String *field,
+Highlighter_new(Searcher *searcher, Obj *query, String *field,
                 uint32_t excerpt_length) {
     Highlighter *self = (Highlighter*)VTable_Make_Obj(HIGHLIGHTER);
     return Highlighter_init(self, searcher, query, field, excerpt_length);
@@ -53,7 +53,7 @@ Highlighter_new(Searcher *searcher, Obj *query, const String *field,
 
 Highlighter*
 Highlighter_init(Highlighter *self, Searcher *searcher, Obj *query,
-                 const String *field, uint32_t excerpt_length) {
+                 String *field, uint32_t excerpt_length) {
     HighlighterIVARS *const ivars = Highlighter_IVARS(self);
     ivars->query          = Searcher_Glean_Query(searcher, query);
     ivars->searcher       = (Searcher*)INCREF(searcher);
@@ -86,7 +86,7 @@ Highlighter_Destroy_IMP(Highlighter *self) {
 }
 
 String*
-Highlighter_Highlight_IMP(Highlighter *self, const String *text) {
+Highlighter_Highlight_IMP(Highlighter *self, String *text) {
     HighlighterIVARS *const ivars = Highlighter_IVARS(self);
     size_t size = Str_Get_Size(text)
                   + Str_Get_Size(ivars->pre_tag)
@@ -101,14 +101,14 @@ Highlighter_Highlight_IMP(Highlighter *self, const String *text) {
 }
 
 void
-Highlighter_Set_Pre_Tag_IMP(Highlighter *self, const String *pre_tag) {
+Highlighter_Set_Pre_Tag_IMP(Highlighter *self, String *pre_tag) {
     HighlighterIVARS *const ivars = Highlighter_IVARS(self);
     DECREF(ivars->pre_tag);
     ivars->pre_tag = Str_Clone(pre_tag);
 }
 
 void
-Highlighter_Set_Post_Tag_IMP(Highlighter *self, const String *post_tag) {
+Highlighter_Set_Post_Tag_IMP(Highlighter *self, String *post_tag) {
     HighlighterIVARS *const ivars = Highlighter_IVARS(self);
     DECREF(ivars->post_tag);
     ivars->post_tag = Str_Clone(post_tag);
@@ -370,7 +370,7 @@ S_find_ending_boundary(StringIterator *tail, uint32_t max_skip,
 }
 
 String*
-Highlighter_Raw_Excerpt_IMP(Highlighter *self, const String *field_val,
+Highlighter_Raw_Excerpt_IMP(Highlighter *self, String *field_val,
                             int32_t *start_ptr, HeatMap *heat_map) {
     HighlighterIVARS *const ivars = Highlighter_IVARS(self);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Highlight/Highlighter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.cfh b/core/Lucy/Highlight/Highlighter.cfh
index afc9a8e..432d8dc 100644
--- a/core/Lucy/Highlight/Highlighter.cfh
+++ b/core/Lucy/Highlight/Highlighter.cfh
@@ -35,7 +35,7 @@ public class Lucy::Highlight::Highlighter inherits Clownfish::Obj {
     Compiler   *compiler;
 
     inert incremented Highlighter*
-    new(Searcher *searcher, Obj *query, const String *field,
+    new(Searcher *searcher, Obj *query, String *field,
         uint32_t excerpt_length = 200);
 
     /**
@@ -50,7 +50,7 @@ public class Lucy::Highlight::Highlighter inherits Clownfish::Obj {
      */
     public inert Highlighter*
     init(Highlighter *self, Searcher *searcher, Obj *query,
-         const String *field, uint32_t excerpt_length = 200);
+         String *field, uint32_t excerpt_length = 200);
 
     /** Take a HitDoc object and return a highlighted excerpt as a string if
      * the HitDoc has a value for the specified <code>field</code>.
@@ -71,17 +71,17 @@ public class Lucy::Highlight::Highlighter inherits Clownfish::Obj {
      * when assembling an excerpt.
      */
     public incremented String*
-    Highlight(Highlighter *self, const String *text);
+    Highlight(Highlighter *self, String *text);
 
     /** Setter.  The default value is "<strong>".
      */
     public void
-    Set_Pre_Tag(Highlighter *self, const String *pre_tag);
+    Set_Pre_Tag(Highlighter *self, String *pre_tag);
 
     /** Setter.  The default value is "</strong>".
      */
     public void
-    Set_Post_Tag(Highlighter *self, const String *post_tag);
+    Set_Post_Tag(Highlighter *self, String *post_tag);
 
     /** Accessor.
      */
@@ -127,7 +127,7 @@ public class Lucy::Highlight::Highlighter inherits Clownfish::Obj {
      * (Helper function for Create_Excerpt only exposed for testing purposes.)
      */
     String*
-    Raw_Excerpt(Highlighter *self, const String *field_value, int32_t *top,
+    Raw_Excerpt(Highlighter *self, String *field_value, int32_t *top,
                 HeatMap *heat_map);
 
     /** Take the text in raw_excerpt, add highlight tags, encode, and place

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/BitVecDelDocs.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BitVecDelDocs.c b/core/Lucy/Index/BitVecDelDocs.c
index 45d414f..80b1343 100644
--- a/core/Lucy/Index/BitVecDelDocs.c
+++ b/core/Lucy/Index/BitVecDelDocs.c
@@ -22,14 +22,14 @@
 #include "Lucy/Store/InStream.h"
 
 BitVecDelDocs*
-BitVecDelDocs_new(Folder *folder, const String *filename) {
+BitVecDelDocs_new(Folder *folder, String *filename) {
     BitVecDelDocs *self = (BitVecDelDocs*)VTable_Make_Obj(BITVECDELDOCS);
     return BitVecDelDocs_init(self, folder, filename);
 }
 
 BitVecDelDocs*
 BitVecDelDocs_init(BitVecDelDocs *self, Folder *folder,
-                   const String *filename) {
+                   String *filename) {
     BitVec_init((BitVector*)self, 0);
     BitVecDelDocsIVARS *const ivars = BitVecDelDocs_IVARS(self);
     ivars->filename = Str_Clone(filename);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/BitVecDelDocs.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BitVecDelDocs.cfh b/core/Lucy/Index/BitVecDelDocs.cfh
index eb33b7a..0988ee0 100644
--- a/core/Lucy/Index/BitVecDelDocs.cfh
+++ b/core/Lucy/Index/BitVecDelDocs.cfh
@@ -22,10 +22,10 @@ class Lucy::Index::BitVecDelDocs inherits Lucy::Object::BitVector {
     String    *filename;
 
     inert incremented BitVecDelDocs*
-    new(Folder *folder, const String *filename);
+    new(Folder *folder, String *filename);
 
     inert BitVecDelDocs*
-    init(BitVecDelDocs *self, Folder *folder, const String *filename);
+    init(BitVecDelDocs *self, Folder *folder, String *filename);
 
     public void
     Destroy(BitVecDelDocs *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/DeletionsWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.c b/core/Lucy/Index/DeletionsWriter.c
index 829a04c..5d9ee5b 100644
--- a/core/Lucy/Index/DeletionsWriter.c
+++ b/core/Lucy/Index/DeletionsWriter.c
@@ -237,7 +237,7 @@ DefDelWriter_Seg_Deletions_IMP(DefaultDeletionsWriter *self,
 
 int32_t
 DefDelWriter_Seg_Del_Count_IMP(DefaultDeletionsWriter *self,
-                               const String *seg_name) {
+                               String *seg_name) {
     DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
     Integer32 *tick
         = (Integer32*)Hash_Fetch(ivars->name_to_tick, (Obj*)seg_name);
@@ -249,7 +249,7 @@ DefDelWriter_Seg_Del_Count_IMP(DefaultDeletionsWriter *self,
 
 void
 DefDelWriter_Delete_By_Term_IMP(DefaultDeletionsWriter *self,
-                                const String *field, Obj *term) {
+                                String *field, Obj *term) {
     DefaultDeletionsWriterIVARS *const ivars = DefDelWriter_IVARS(self);
     for (uint32_t i = 0, max = VA_Get_Size(ivars->seg_readers); i < max; i++) {
         SegReader *seg_reader = (SegReader*)VA_Fetch(ivars->seg_readers, i);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/DeletionsWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.cfh b/core/Lucy/Index/DeletionsWriter.cfh
index 1e60822..755465c 100644
--- a/core/Lucy/Index/DeletionsWriter.cfh
+++ b/core/Lucy/Index/DeletionsWriter.cfh
@@ -47,7 +47,7 @@ public abstract class Lucy::Index::DeletionsWriter cnick DelWriter
      * will be processed automatically (so don't pre-process it yourself).
      */
     public abstract void
-    Delete_By_Term(DeletionsWriter *self, const String *field, Obj *term);
+    Delete_By_Term(DeletionsWriter *self, String *field, Obj *term);
 
     /** Delete all documents in the index that match <code>query</code>.
      *
@@ -92,7 +92,7 @@ public abstract class Lucy::Index::DeletionsWriter cnick DelWriter
      * @param seg_name The name of the segment.
      */
     public abstract int32_t
-    Seg_Del_Count(DeletionsWriter *self, const String *seg_name);
+    Seg_Del_Count(DeletionsWriter *self, String *seg_name);
 }
 
 /** Implements DeletionsWriter using BitVector files.
@@ -124,7 +124,7 @@ class Lucy::Index::DefaultDeletionsWriter cnick DefDelWriter
          Segment *segment, PolyReader *polyreader);
 
     public void
-    Delete_By_Term(DefaultDeletionsWriter *self, const String *field,
+    Delete_By_Term(DefaultDeletionsWriter *self, String *field,
                    Obj *term);
 
     public void
@@ -140,7 +140,7 @@ class Lucy::Index::DefaultDeletionsWriter cnick DefDelWriter
     Seg_Deletions(DefaultDeletionsWriter *self, SegReader *seg_reader);
 
     public int32_t
-    Seg_Del_Count(DefaultDeletionsWriter *self, const String *seg_name);
+    Seg_Del_Count(DefaultDeletionsWriter *self, String *seg_name);
 
     public void
     Add_Segment(DefaultDeletionsWriter *self, SegReader *reader,

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/DocVector.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocVector.c b/core/Lucy/Index/DocVector.c
index 585c955..6529a3e 100644
--- a/core/Lucy/Index/DocVector.c
+++ b/core/Lucy/Index/DocVector.c
@@ -32,7 +32,7 @@ S_extract_tv_cache(ByteBuf *field_buf);
 
 // Pull a TermVector object out from compressed positional data.
 static TermVector*
-S_extract_tv_from_tv_buf(const String *field, const String *term_text,
+S_extract_tv_from_tv_buf(String *field, String *term_text,
                          ByteBuf *tv_buf);
 
 DocVector*
@@ -73,14 +73,14 @@ DocVec_Destroy_IMP(DocVector *self) {
 }
 
 void
-DocVec_Add_Field_Buf_IMP(DocVector *self, const String *field,
+DocVec_Add_Field_Buf_IMP(DocVector *self, String *field,
                          ByteBuf *field_buf) {
     DocVectorIVARS *const ivars = DocVec_IVARS(self);
     Hash_Store(ivars->field_bufs, (Obj*)field, INCREF(field_buf));
 }
 
 ByteBuf*
-DocVec_Field_Buf_IMP(DocVector *self, const String *field) {
+DocVec_Field_Buf_IMP(DocVector *self, String *field) {
     DocVectorIVARS *const ivars = DocVec_IVARS(self);
     return (ByteBuf*)Hash_Fetch(ivars->field_bufs, (Obj*)field);
 }
@@ -92,8 +92,8 @@ DocVec_Field_Names_IMP(DocVector *self) {
 }
 
 TermVector*
-DocVec_Term_Vector_IMP(DocVector *self, const String *field,
-                       const String *term_text) {
+DocVec_Term_Vector_IMP(DocVector *self, String *field,
+                       String *term_text) {
     DocVectorIVARS *const ivars = DocVec_IVARS(self);
     Hash *field_vector = (Hash*)Hash_Fetch(ivars->field_vectors, (Obj*)field);
 
@@ -158,7 +158,7 @@ S_extract_tv_cache(ByteBuf *field_buf) {
 }
 
 static TermVector*
-S_extract_tv_from_tv_buf(const String *field, const String *term_text,
+S_extract_tv_from_tv_buf(String *field, String *term_text,
                          ByteBuf *tv_buf) {
     TermVector *retval      = NULL;
     char       *posdata     = BB_Get_Buf(tv_buf);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/DocVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocVector.cfh b/core/Lucy/Index/DocVector.cfh
index 6217eec..8ff0e83 100644
--- a/core/Lucy/Index/DocVector.cfh
+++ b/core/Lucy/Index/DocVector.cfh
@@ -34,18 +34,18 @@ class Lucy::Index::DocVector cnick DocVec
     init(DocVector *self);
 
     incremented TermVector*
-    Term_Vector(DocVector *self, const String *field, const String *term);
+    Term_Vector(DocVector *self, String *field, String *term);
 
     /** Add a compressed, encoded TermVector to the object.
      */
     void
-    Add_Field_Buf(DocVector *self, const String *field, ByteBuf *field_buf);
+    Add_Field_Buf(DocVector *self, String *field, ByteBuf *field_buf);
 
     /** Return the compressed, encoded TermVector associated with a particular
      * field.
      */
     ByteBuf*
-    Field_Buf(DocVector *self, const String *field);
+    Field_Buf(DocVector *self, String *field);
 
     public void
     Serialize(DocVector *self, OutStream *outstream);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/IndexManager.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexManager.c b/core/Lucy/Index/IndexManager.c
index 3a6442e..40f922a 100644
--- a/core/Lucy/Index/IndexManager.c
+++ b/core/Lucy/Index/IndexManager.c
@@ -32,13 +32,13 @@
 #include "Clownfish/Util/StringHelper.h"
 
 IndexManager*
-IxManager_new(const String *host, LockFactory *lock_factory) {
+IxManager_new(String *host, LockFactory *lock_factory) {
     IndexManager *self = (IndexManager*)VTable_Make_Obj(INDEXMANAGER);
     return IxManager_init(self, host, lock_factory);
 }
 
 IndexManager*
-IxManager_init(IndexManager *self, const String *host,
+IxManager_init(IndexManager *self, String *host,
                LockFactory *lock_factory) {
     IndexManagerIVARS *const ivars = IxManager_IVARS(self);
     ivars->host                = host
@@ -303,7 +303,7 @@ IxManager_Remove_Merge_Data_IMP(IndexManager *self) {
 
 Lock*
 IxManager_Make_Snapshot_Read_Lock_IMP(IndexManager *self,
-                                      const String *filename) {
+                                      String *filename) {
     LockFactory *lock_factory = S_obtain_lock_factory(self);
 
     if (!Str_Starts_With_Utf8(filename, "snapshot_", 9)

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/IndexManager.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexManager.cfh b/core/Lucy/Index/IndexManager.cfh
index 79308e0..7dc5e8b 100644
--- a/core/Lucy/Index/IndexManager.cfh
+++ b/core/Lucy/Index/IndexManager.cfh
@@ -40,14 +40,14 @@ public class Lucy::Index::IndexManager cnick IxManager
     uint32_t     deletion_lock_interval;
 
     public inert incremented IndexManager*
-    new(const String *host = NULL, LockFactory *lock_factory = NULL);
+    new(String *host = NULL, LockFactory *lock_factory = NULL);
 
     /**
      * @param host An identifier which should be unique per-machine.
      * @param lock_factory A LockFactory.
      */
     public inert IndexManager*
-    init(IndexManager *self, const String *host = NULL,
+    init(IndexManager *self, String *host = NULL,
          LockFactory *lock_factory = NULL);
 
     public void
@@ -131,7 +131,7 @@ public class Lucy::Index::IndexManager cnick IxManager
      * all the files it lists and indicates that they must not be deleted.
      */
     public incremented Lock*
-    Make_Snapshot_Read_Lock(IndexManager *self, const String *filename);
+    Make_Snapshot_Read_Lock(IndexManager *self, String *filename);
 
     /** Return the highest number for a segment directory which contains a
      * segmeta file in the snapshot.

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/IndexReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexReader.c b/core/Lucy/Index/IndexReader.c
index dd27114..e8d8c65 100644
--- a/core/Lucy/Index/IndexReader.c
+++ b/core/Lucy/Index/IndexReader.c
@@ -108,7 +108,7 @@ IxReader_Get_Components_IMP(IndexReader *self) {
 }
 
 DataReader*
-IxReader_Obtain_IMP(IndexReader *self, const String *api) {
+IxReader_Obtain_IMP(IndexReader *self, String *api) {
     IndexReaderIVARS *const ivars = IxReader_IVARS(self);
     DataReader *component
         = (DataReader*)Hash_Fetch(ivars->components, (Obj*)api);
@@ -119,7 +119,7 @@ IxReader_Obtain_IMP(IndexReader *self, const String *api) {
 }
 
 DataReader*
-IxReader_Fetch_IMP(IndexReader *self, const String *api) {
+IxReader_Fetch_IMP(IndexReader *self, String *api) {
     IndexReaderIVARS *const ivars = IxReader_IVARS(self);
     return (DataReader*)Hash_Fetch(ivars->components, (Obj*)api);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/IndexReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexReader.cfh b/core/Lucy/Index/IndexReader.cfh
index d460afc..1b647e9 100644
--- a/core/Lucy/Index/IndexReader.cfh
+++ b/core/Lucy/Index/IndexReader.cfh
@@ -102,7 +102,7 @@ public class Lucy::Index::IndexReader cnick IxReader
      * component must implement.
      */
     public DataReader*
-    Obtain(IndexReader *self, const String *api);
+    Obtain(IndexReader *self, String *api);
 
     /** Fetch a component, or return NULL if the component can't be found.
      *
@@ -110,7 +110,7 @@ public class Lucy::Index::IndexReader cnick IxReader
      * component must implement.
      */
     public nullable DataReader*
-    Fetch(IndexReader *self, const String *api);
+    Fetch(IndexReader *self, String *api);
 
     public void
     Close(IndexReader *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/Inverter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.c b/core/Lucy/Index/Inverter.c
index d24e14f..6ab0a74 100644
--- a/core/Lucy/Index/Inverter.c
+++ b/core/Lucy/Index/Inverter.c
@@ -192,13 +192,13 @@ Inverter_Clear_IMP(Inverter *self) {
 }
 
 InverterEntry*
-InvEntry_new(Schema *schema, const String *field, int32_t field_num) {
+InvEntry_new(Schema *schema, String *field, int32_t field_num) {
     InverterEntry *self = (InverterEntry*)VTable_Make_Obj(INVERTERENTRY);
     return InvEntry_init(self, schema, field, field_num);
 }
 
 InverterEntry*
-InvEntry_init(InverterEntry *self, Schema *schema, const String *field,
+InvEntry_init(InverterEntry *self, Schema *schema, String *field,
               int32_t field_num) {
     InverterEntryIVARS *const ivars = InvEntry_IVARS(self);
     ivars->field_num  = field_num;

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/Inverter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.cfh b/core/Lucy/Index/Inverter.cfh
index 6fcf8ff..9dab4e4 100644
--- a/core/Lucy/Index/Inverter.cfh
+++ b/core/Lucy/Index/Inverter.cfh
@@ -155,11 +155,11 @@ final class Lucy::Index::Inverter::InverterEntry cnick InvEntry
     bool         highlightable;
 
     inert incremented InverterEntry*
-    new(Schema *schema = NULL, const String *field_name, int32_t field_num);
+    new(Schema *schema = NULL, String *field_name, int32_t field_num);
 
     inert InverterEntry*
     init(InverterEntry *self = NULL, Schema *schema,
-         const String *field_name, int32_t field_num);
+         String *field_name, int32_t field_num);
 
     public int32_t
     Compare_To(InverterEntry *self, Obj *other);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexIndex.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexIndex.c b/core/Lucy/Index/LexIndex.c
index f8a2a82..9b7905f 100644
--- a/core/Lucy/Index/LexIndex.c
+++ b/core/Lucy/Index/LexIndex.c
@@ -33,14 +33,14 @@ S_read_entry(LexIndex *self);
 
 LexIndex*
 LexIndex_new(Schema *schema, Folder *folder, Segment *segment,
-             const String *field) {
+             String *field) {
     LexIndex *self = (LexIndex*)VTable_Make_Obj(LEXINDEX);
     return LexIndex_init(self, schema, folder, segment, field);
 }
 
 LexIndex*
 LexIndex_init(LexIndex *self, Schema *schema, Folder *folder,
-              Segment *segment, const String *field) {
+              Segment *segment, String *field) {
     int32_t  field_num = Seg_Field_Num(segment, field);
     String  *seg_name  = Seg_Get_Name(segment);
     String  *ixix_file = Str_newf("%o/lexicon-%i32.ixix", seg_name, field_num);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexIndex.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexIndex.cfh b/core/Lucy/Index/LexIndex.cfh
index e28499d..3d197fe 100644
--- a/core/Lucy/Index/LexIndex.cfh
+++ b/core/Lucy/Index/LexIndex.cfh
@@ -31,11 +31,11 @@ class Lucy::Index::LexIndex inherits Lucy::Index::Lexicon {
 
     inert incremented LexIndex*
     new(Schema *schema, Folder *folder, Segment *segment,
-        const String *field);
+        String *field);
 
     inert LexIndex*
     init(LexIndex *self, Schema *schema, Folder *folder, Segment *segment,
-         const String *field);
+         String *field);
 
     public void
     Seek(LexIndex *self, Obj *target = NULL);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/Lexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Lexicon.c b/core/Lucy/Index/Lexicon.c
index 56c1bbf..0669bf8 100644
--- a/core/Lucy/Index/Lexicon.c
+++ b/core/Lucy/Index/Lexicon.c
@@ -20,7 +20,7 @@
 #include "Lucy/Index/Lexicon.h"
 
 Lexicon*
-Lex_init(Lexicon *self, const String *field) {
+Lex_init(Lexicon *self, String *field) {
     LexiconIVARS *const ivars = Lex_IVARS(self);
     ivars->field = Str_Clone(field);
     ABSTRACT_CLASS_CHECK(self, LEXICON);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/Lexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Lexicon.cfh b/core/Lucy/Index/Lexicon.cfh
index 68335d4..2372d71 100644
--- a/core/Lucy/Index/Lexicon.cfh
+++ b/core/Lucy/Index/Lexicon.cfh
@@ -36,7 +36,7 @@ public class Lucy::Index::Lexicon cnick Lex inherits Clownfish::Obj {
     String *field;
 
     public inert Lexicon*
-    init(Lexicon *self, const String *field);
+    init(Lexicon *self, String *field);
 
     public void
     Destroy(Lexicon *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexiconReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconReader.c b/core/Lucy/Index/LexiconReader.c
index fa00da8..a732291 100644
--- a/core/Lucy/Index/LexiconReader.c
+++ b/core/Lucy/Index/LexiconReader.c
@@ -90,7 +90,7 @@ PolyLexReader_Destroy_IMP(PolyLexiconReader *self) {
 }
 
 Lexicon*
-PolyLexReader_Lexicon_IMP(PolyLexiconReader *self, const String *field,
+PolyLexReader_Lexicon_IMP(PolyLexiconReader *self, String *field,
                           Obj *term) {
     PolyLexicon *lexicon = NULL;
 
@@ -112,7 +112,7 @@ PolyLexReader_Lexicon_IMP(PolyLexiconReader *self, const String *field,
 }
 
 uint32_t
-PolyLexReader_Doc_Freq_IMP(PolyLexiconReader *self, const String *field,
+PolyLexReader_Doc_Freq_IMP(PolyLexiconReader *self, String *field,
                            Obj *term) {
     PolyLexiconReaderIVARS *const ivars = PolyLexReader_IVARS(self);
     uint32_t doc_freq = 0;
@@ -194,7 +194,7 @@ DefLexReader_Destroy_IMP(DefaultLexiconReader *self) {
 }
 
 Lexicon*
-DefLexReader_Lexicon_IMP(DefaultLexiconReader *self, const String *field,
+DefLexReader_Lexicon_IMP(DefaultLexiconReader *self, String *field,
                          Obj *term) {
     DefaultLexiconReaderIVARS *const ivars = DefLexReader_IVARS(self);
     int32_t     field_num = Seg_Field_Num(ivars->segment, field);
@@ -211,7 +211,7 @@ DefLexReader_Lexicon_IMP(DefaultLexiconReader *self, const String *field,
 }
 
 static TermInfo*
-S_find_tinfo(DefaultLexiconReader *self, const String *field, Obj *target) {
+S_find_tinfo(DefaultLexiconReader *self, String *field, Obj *target) {
     DefaultLexiconReaderIVARS *const ivars = DefLexReader_IVARS(self);
     if (field != NULL && target != NULL) {
         int32_t field_num = Seg_Field_Num(ivars->segment, field);
@@ -234,13 +234,13 @@ S_find_tinfo(DefaultLexiconReader *self, const String *field, Obj *target) {
 
 TermInfo*
 DefLexReader_Fetch_Term_Info_IMP(DefaultLexiconReader *self,
-                                 const String *field, Obj *target) {
+                                 String *field, Obj *target) {
     TermInfo *tinfo = S_find_tinfo(self, field, target);
     return tinfo ? TInfo_Clone(tinfo) : NULL;
 }
 
 uint32_t
-DefLexReader_Doc_Freq_IMP(DefaultLexiconReader *self, const String *field,
+DefLexReader_Doc_Freq_IMP(DefaultLexiconReader *self, String *field,
                           Obj *term) {
     TermInfo *tinfo = S_find_tinfo(self, field, term);
     return tinfo ? TInfo_Get_Doc_Freq(tinfo) : 0;

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexiconReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconReader.cfh b/core/Lucy/Index/LexiconReader.cfh
index 471d62a..cc7e01a 100644
--- a/core/Lucy/Index/LexiconReader.cfh
+++ b/core/Lucy/Index/LexiconReader.cfh
@@ -36,17 +36,17 @@ public abstract class Lucy::Index::LexiconReader cnick LexReader
      * @param term Pre-locate the Lexicon to this term.
      */
     public abstract incremented nullable Lexicon*
-    Lexicon(LexiconReader *self, const String *field, Obj *term = NULL);
+    Lexicon(LexiconReader *self, String *field, Obj *term = NULL);
 
     /** Return the number of documents where the specified term is present.
      */
     public abstract uint32_t
-    Doc_Freq(LexiconReader *self, const String *field, Obj *term);
+    Doc_Freq(LexiconReader *self, String *field, Obj *term);
 
     /** If the term can be found, return a term info, otherwise return NULL.
      */
     abstract incremented nullable TermInfo*
-    Fetch_Term_Info(LexiconReader *self, const String *field, Obj *term);
+    Fetch_Term_Info(LexiconReader *self, String *field, Obj *term);
 
     /** Return a LexiconReader which merges the output of other
      * LexiconReaders.
@@ -71,10 +71,10 @@ class Lucy::Index::PolyLexiconReader cnick PolyLexReader
     init(PolyLexiconReader *self, VArray *readers, I32Array *offsets);
 
     public incremented nullable Lexicon*
-    Lexicon(PolyLexiconReader *self, const String *field, Obj *term = NULL);
+    Lexicon(PolyLexiconReader *self, String *field, Obj *term = NULL);
 
     public uint32_t
-    Doc_Freq(PolyLexiconReader *self, const String *field, Obj *term);
+    Doc_Freq(PolyLexiconReader *self, String *field, Obj *term);
 
     public void
     Close(PolyLexiconReader *self);
@@ -97,16 +97,16 @@ class Lucy::Index::DefaultLexiconReader cnick DefLexReader
          Snapshot *snapshot, VArray *segments, int32_t seg_tick);
 
     public incremented nullable Lexicon*
-    Lexicon(DefaultLexiconReader *self, const String *field,
+    Lexicon(DefaultLexiconReader *self, String *field,
             Obj *term = NULL);
 
     /** Return the number of documents in which the term appears.
      */
     public uint32_t
-    Doc_Freq(DefaultLexiconReader *self, const String *field, Obj *term);
+    Doc_Freq(DefaultLexiconReader *self, String *field, Obj *term);
 
     incremented nullable TermInfo*
-    Fetch_Term_Info(DefaultLexiconReader *self, const String *field,
+    Fetch_Term_Info(DefaultLexiconReader *self, String *field,
                     Obj *term);
 
     public void

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexiconWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconWriter.c b/core/Lucy/Index/LexiconWriter.c
index 4253e67..a0dc149 100644
--- a/core/Lucy/Index/LexiconWriter.c
+++ b/core/Lucy/Index/LexiconWriter.c
@@ -182,7 +182,7 @@ LexWriter_Finish_Field_IMP(LexiconWriter *self, int32_t field_num) {
 }
 
 void
-LexWriter_Enter_Temp_Mode_IMP(LexiconWriter *self, const String *field,
+LexWriter_Enter_Temp_Mode_IMP(LexiconWriter *self, String *field,
                               OutStream *temp_outstream) {
     LexiconWriterIVARS *const ivars = LexWriter_IVARS(self);
     Schema    *schema = LexWriter_Get_Schema(self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/LexiconWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconWriter.cfh b/core/Lucy/Index/LexiconWriter.cfh
index 867120c..b015a6d 100644
--- a/core/Lucy/Index/LexiconWriter.cfh
+++ b/core/Lucy/Index/LexiconWriter.cfh
@@ -60,7 +60,7 @@ class Lucy::Index::LexiconWriter cnick LexWriter
     /** Prepare to write terms to a temporary file.
      */
     void
-    Enter_Temp_Mode(LexiconWriter *self, const String *field,
+    Enter_Temp_Mode(LexiconWriter *self, String *field,
                     OutStream *temp_outstream);
 
     /** Stop writing terms to temp file.  Abandon (but don't close) the file.

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PolyLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyLexicon.c b/core/Lucy/Index/PolyLexicon.c
index 2315839..cf57189 100644
--- a/core/Lucy/Index/PolyLexicon.c
+++ b/core/Lucy/Index/PolyLexicon.c
@@ -29,13 +29,13 @@ static void
 S_refresh_lex_q(SegLexQueue *lex_q, VArray *seg_lexicons, Obj *target);
 
 PolyLexicon*
-PolyLex_new(const String *field, VArray *sub_readers) {
+PolyLex_new(String *field, VArray *sub_readers) {
     PolyLexicon *self = (PolyLexicon*)VTable_Make_Obj(POLYLEXICON);
     return PolyLex_init(self, field, sub_readers);
 }
 
 PolyLexicon*
-PolyLex_init(PolyLexicon *self, const String *field, VArray *sub_readers) {
+PolyLex_init(PolyLexicon *self, String *field, VArray *sub_readers) {
     uint32_t  num_sub_readers = VA_Get_Size(sub_readers);
     VArray   *seg_lexicons    = VA_new(num_sub_readers);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PolyLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyLexicon.cfh b/core/Lucy/Index/PolyLexicon.cfh
index 87eca4e..11b6d17 100644
--- a/core/Lucy/Index/PolyLexicon.cfh
+++ b/core/Lucy/Index/PolyLexicon.cfh
@@ -30,10 +30,10 @@ class Lucy::Index::PolyLexicon cnick PolyLex
     int32_t         size;
 
     inert incremented PolyLexicon*
-    new(const String *field, VArray *sub_readers);
+    new(String *field, VArray *sub_readers);
 
     inert PolyLexicon*
-    init(PolyLexicon *self, const String *field, VArray *sub_readers);
+    init(PolyLexicon *self, String *field, VArray *sub_readers);
 
     public void
     Seek(PolyLexicon *self, Obj *target = NULL);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PolyReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyReader.c b/core/Lucy/Index/PolyReader.c
index 267a3e9..c9c4890 100644
--- a/core/Lucy/Index/PolyReader.c
+++ b/core/Lucy/Index/PolyReader.c
@@ -36,7 +36,7 @@
 
 // Obtain/release read locks and commit locks.
 static bool
-S_obtain_read_lock(PolyReader *self, const String *snapshot_filename);
+S_obtain_read_lock(PolyReader *self, String *snapshot_filename);
 static bool 
 S_obtain_deletion_lock(PolyReader *self);
 static void
@@ -478,7 +478,7 @@ S_obtain_deletion_lock(PolyReader *self) {
 }
 
 static bool
-S_obtain_read_lock(PolyReader *self, const String *snapshot_file_name) {
+S_obtain_read_lock(PolyReader *self, String *snapshot_file_name) {
     PolyReaderIVARS *const ivars = PolyReader_IVARS(self);
     ivars->read_lock = IxManager_Make_Snapshot_Read_Lock(ivars->manager,
                                                          snapshot_file_name);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PostingListReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingListReader.c b/core/Lucy/Index/PostingListReader.c
index f643917..4ad2501 100644
--- a/core/Lucy/Index/PostingListReader.c
+++ b/core/Lucy/Index/PostingListReader.c
@@ -109,7 +109,7 @@ DefPListReader_Destroy_IMP(DefaultPostingListReader *self) {
 
 SegPostingList*
 DefPListReader_Posting_List_IMP(DefaultPostingListReader *self,
-                                const String *field, Obj *target) {
+                                String *field, Obj *target) {
     DefaultPostingListReaderIVARS *const ivars = DefPListReader_IVARS(self);
     FieldType *type = Schema_Fetch_Type(ivars->schema, field);
 

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PostingListReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingListReader.cfh b/core/Lucy/Index/PostingListReader.cfh
index 8157af6..9aef573 100644
--- a/core/Lucy/Index/PostingListReader.cfh
+++ b/core/Lucy/Index/PostingListReader.cfh
@@ -37,7 +37,7 @@ public class Lucy::Index::PostingListReader cnick PListReader
      * term using Seek().
      */
     public abstract incremented nullable PostingList*
-    Posting_List(PostingListReader *self, const String *field = NULL,
+    Posting_List(PostingListReader *self, String *field = NULL,
                  Obj *term = NULL);
 
     abstract LexiconReader*
@@ -65,7 +65,7 @@ class Lucy::Index::DefaultPostingListReader cnick DefPListReader
          LexiconReader *lex_reader);
 
     public incremented nullable SegPostingList*
-    Posting_List(DefaultPostingListReader *self, const String *field = NULL,
+    Posting_List(DefaultPostingListReader *self, String *field = NULL,
                  Obj *term = NULL);
 
     LexiconReader*

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PostingPool.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.c b/core/Lucy/Index/PostingPool.c
index a3e61c0..6cf0d40 100644
--- a/core/Lucy/Index/PostingPool.c
+++ b/core/Lucy/Index/PostingPool.c
@@ -59,7 +59,7 @@ S_write_terms_and_postings(PostingPool *self, PostingWriter *post_writer,
 
 PostingPool*
 PostPool_new(Schema *schema, Snapshot *snapshot, Segment *segment,
-             PolyReader *polyreader,  const String *field,
+             PolyReader *polyreader,  String *field,
              LexiconWriter *lex_writer, MemoryPool *mem_pool,
              OutStream *lex_temp_out, OutStream *post_temp_out,
              OutStream *skip_out) {
@@ -71,7 +71,7 @@ PostPool_new(Schema *schema, Snapshot *snapshot, Segment *segment,
 
 PostingPool*
 PostPool_init(PostingPool *self, Schema *schema, Snapshot *snapshot,
-              Segment *segment, PolyReader *polyreader, const String *field,
+              Segment *segment, PolyReader *polyreader, String *field,
               LexiconWriter *lex_writer, MemoryPool *mem_pool,
               OutStream *lex_temp_out, OutStream *post_temp_out,
               OutStream *skip_out) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/PostingPool.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.cfh b/core/Lucy/Index/PostingPool.cfh
index 570ec15..590680c 100644
--- a/core/Lucy/Index/PostingPool.cfh
+++ b/core/Lucy/Index/PostingPool.cfh
@@ -51,14 +51,14 @@ class Lucy::Index::PostingPool cnick PostPool
 
     inert incremented PostingPool*
     new(Schema *schema, Snapshot *snapshot, Segment *segment,
-        PolyReader *polyreader, const String *field,
+        PolyReader *polyreader, String *field,
         LexiconWriter *lex_writer, MemoryPool *mem_pool,
         OutStream *lex_temp_out, OutStream *post_temp_out,
         OutStream *skip_out);
 
     inert PostingPool*
     init(PostingPool *self, Schema *schema, Snapshot *snapshot,
-         Segment *segment, PolyReader *polyreader, const String *field,
+         Segment *segment, PolyReader *polyreader, String *field,
          LexiconWriter *lex_writer, MemoryPool *mem_pool,
          OutStream *lex_temp_out, OutStream *post_temp_out,
          OutStream *skip_out);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/RawLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawLexicon.c b/core/Lucy/Index/RawLexicon.c
index 66b4336..2652d96 100644
--- a/core/Lucy/Index/RawLexicon.c
+++ b/core/Lucy/Index/RawLexicon.c
@@ -26,14 +26,14 @@
 #include "Lucy/Store/InStream.h"
 
 RawLexicon*
-RawLex_new(Schema *schema, const String *field, InStream *instream,
+RawLex_new(Schema *schema, String *field, InStream *instream,
            int64_t start, int64_t end) {
     RawLexicon *self = (RawLexicon*)VTable_Make_Obj(RAWLEXICON);
     return RawLex_init(self, schema, field, instream, start, end);
 }
 
 RawLexicon*
-RawLex_init(RawLexicon *self, Schema *schema, const String *field,
+RawLex_init(RawLexicon *self, Schema *schema, String *field,
             InStream *instream, int64_t start, int64_t end) {
     FieldType *type = Schema_Fetch_Type(schema, field);
     Lex_init((Lexicon*)self, field);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/RawLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawLexicon.cfh b/core/Lucy/Index/RawLexicon.cfh
index 59b5f36..b0a8b3a 100644
--- a/core/Lucy/Index/RawLexicon.cfh
+++ b/core/Lucy/Index/RawLexicon.cfh
@@ -29,11 +29,11 @@ class Lucy::Index::RawLexicon cnick RawLex
     int64_t        len;
 
     inert incremented RawLexicon*
-    new(Schema *schema, const String *field, InStream *instream,
+    new(Schema *schema, String *field, InStream *instream,
         int64_t start, int64_t end);
 
     inert RawLexicon*
-    init(RawLexicon *self, Schema *schema, const String *field,
+    init(RawLexicon *self, Schema *schema, String *field,
          InStream *instream, int64_t start, int64_t end);
 
     public void

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/RawPostingList.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawPostingList.c b/core/Lucy/Index/RawPostingList.c
index 8518893..b2ced79 100644
--- a/core/Lucy/Index/RawPostingList.c
+++ b/core/Lucy/Index/RawPostingList.c
@@ -26,14 +26,14 @@
 #include "Lucy/Util/MemoryPool.h"
 
 RawPostingList*
-RawPList_new(Schema *schema, const String *field, InStream *instream,
+RawPList_new(Schema *schema, String *field, InStream *instream,
              int64_t start, int64_t end) {
     RawPostingList *self = (RawPostingList*)VTable_Make_Obj(RAWPOSTINGLIST);
     return RawPList_init(self, schema, field, instream, start, end);
 }
 
 RawPostingList*
-RawPList_init(RawPostingList *self, Schema *schema, const String *field,
+RawPList_init(RawPostingList *self, Schema *schema, String *field,
               InStream *instream, int64_t start, int64_t end) {
     PList_init((PostingList*)self);
     RawPostingListIVARS *const ivars = RawPList_IVARS(self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/RawPostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawPostingList.cfh b/core/Lucy/Index/RawPostingList.cfh
index 37da0e9..0ba119c 100644
--- a/core/Lucy/Index/RawPostingList.cfh
+++ b/core/Lucy/Index/RawPostingList.cfh
@@ -26,11 +26,11 @@ class Lucy::Index::RawPostingList cnick RawPList
     int64_t        len;
 
     inert incremented RawPostingList*
-    new(Schema *schema, const String *field, InStream *instream,
+    new(Schema *schema, String *field, InStream *instream,
         int64_t start, int64_t end);
 
     inert RawPostingList*
-    init(RawPostingList *self, Schema *schema, const String *field,
+    init(RawPostingList *self, Schema *schema, String *field,
          InStream *instream, int64_t lex_start, int64_t lex_end);
 
     public void

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegLexicon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegLexicon.c b/core/Lucy/Index/SegLexicon.c
index dd5931f..bd6e3df 100644
--- a/core/Lucy/Index/SegLexicon.c
+++ b/core/Lucy/Index/SegLexicon.c
@@ -38,14 +38,14 @@ S_scan_to(SegLexicon *self, Obj *target);
 
 SegLexicon*
 SegLex_new(Schema *schema, Folder *folder, Segment *segment,
-           const String *field) {
+           String *field) {
     SegLexicon *self = (SegLexicon*)VTable_Make_Obj(SEGLEXICON);
     return SegLex_init(self, schema, folder, segment, field);
 }
 
 SegLexicon*
 SegLex_init(SegLexicon *self, Schema *schema, Folder *folder,
-            Segment *segment, const String *field) {
+            Segment *segment, String *field) {
     Hash *metadata = (Hash*)CERTIFY(
                          Seg_Fetch_Metadata_Utf8(segment, "lexicon", 7),
                          HASH);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegLexicon.cfh b/core/Lucy/Index/SegLexicon.cfh
index c710735..dd25b05 100644
--- a/core/Lucy/Index/SegLexicon.cfh
+++ b/core/Lucy/Index/SegLexicon.cfh
@@ -41,11 +41,11 @@ class Lucy::Index::SegLexicon cnick SegLex
      */
     inert incremented SegLexicon*
     new(Schema *schema, Folder *folder, Segment *segment,
-        const String *field);
+        String *field);
 
     inert SegLexicon*
     init(SegLexicon *self, Schema *schema, Folder *folder, Segment *segment,
-         const String *field);
+         String *field);
 
     nullable TermInfo*
     Get_Term_Info(SegLexicon *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegPostingList.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.c b/core/Lucy/Index/SegPostingList.c
index 71b344d..62dcdf4 100644
--- a/core/Lucy/Index/SegPostingList.c
+++ b/core/Lucy/Index/SegPostingList.c
@@ -43,14 +43,14 @@ static void
 S_seek_tinfo(SegPostingList *self, TermInfo *tinfo);
 
 SegPostingList*
-SegPList_new(PostingListReader *plist_reader, const String *field) {
+SegPList_new(PostingListReader *plist_reader, String *field) {
     SegPostingList *self = (SegPostingList*)VTable_Make_Obj(SEGPOSTINGLIST);
     return SegPList_init(self, plist_reader, field);
 }
 
 SegPostingList*
 SegPList_init(SegPostingList *self, PostingListReader *plist_reader,
-              const String *field) {
+              String *field) {
     SegPostingListIVARS *const ivars = SegPList_IVARS(self);
     Schema       *const schema   = PListReader_Get_Schema(plist_reader);
     Folder       *const folder   = PListReader_Get_Folder(plist_reader);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegPostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.cfh b/core/Lucy/Index/SegPostingList.cfh
index 0213dde..8209fb4 100644
--- a/core/Lucy/Index/SegPostingList.cfh
+++ b/core/Lucy/Index/SegPostingList.cfh
@@ -36,11 +36,11 @@ class Lucy::Index::SegPostingList cnick SegPList
     int32_t            field_num;
 
     inert incremented SegPostingList*
-    new(PostingListReader *plist_reader, const String *field);
+    new(PostingListReader *plist_reader, String *field);
 
     inert SegPostingList*
     init(SegPostingList *self, PostingListReader *plist_reader,
-         const String *field);
+         String *field);
 
     InStream*
     Get_Post_Stream(SegPostingList *self);

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegReader.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegReader.c b/core/Lucy/Index/SegReader.c
index 3a7db4c..b8ff67c 100644
--- a/core/Lucy/Index/SegReader.c
+++ b/core/Lucy/Index/SegReader.c
@@ -84,7 +84,7 @@ SegReader_Destroy_IMP(SegReader *self) {
 }
 
 void
-SegReader_Register_IMP(SegReader *self, const String *api,
+SegReader_Register_IMP(SegReader *self, String *api,
                        DataReader *component) {
     SegReaderIVARS *const ivars = SegReader_IVARS(self);
     if (Hash_Fetch(ivars->components, (Obj*)api)) {

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegReader.cfh b/core/Lucy/Index/SegReader.cfh
index ee5e638..44660fe 100644
--- a/core/Lucy/Index/SegReader.cfh
+++ b/core/Lucy/Index/SegReader.cfh
@@ -63,7 +63,7 @@ public class Lucy::Index::SegReader inherits Lucy::Index::IndexReader {
      * @param component A DataReader.
      */
     public void
-    Register(SegReader *self, const String *api,
+    Register(SegReader *self, String *api,
              decremented DataReader *component);
 
     /** Return the name of the segment.

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegWriter.c b/core/Lucy/Index/SegWriter.c
index d980ab9..adcd6a1 100644
--- a/core/Lucy/Index/SegWriter.c
+++ b/core/Lucy/Index/SegWriter.c
@@ -61,7 +61,7 @@ SegWriter_Destroy_IMP(SegWriter *self) {
 }
 
 void
-SegWriter_Register_IMP(SegWriter *self, const String *api,
+SegWriter_Register_IMP(SegWriter *self, String *api,
                        DataWriter *component) {
     SegWriterIVARS *const ivars = SegWriter_IVARS(self);
     CERTIFY(component, DATAWRITER);
@@ -72,7 +72,7 @@ SegWriter_Register_IMP(SegWriter *self, const String *api,
 }
 
 Obj*
-SegWriter_Fetch_IMP(SegWriter *self, const String *api) {
+SegWriter_Fetch_IMP(SegWriter *self, String *api) {
     SegWriterIVARS *const ivars = SegWriter_IVARS(self);
     return Hash_Fetch(ivars->by_api, (Obj*)api);
 }

http://git-wip-us.apache.org/repos/asf/lucy/blob/1929b635/core/Lucy/Index/SegWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegWriter.cfh b/core/Lucy/Index/SegWriter.cfh
index 868f869..047525c 100644
--- a/core/Lucy/Index/SegWriter.cfh
+++ b/core/Lucy/Index/SegWriter.cfh
@@ -65,7 +65,7 @@ public class Lucy::Index::SegWriter inherits Lucy::Index::DataWriter {
      * @param component A DataWriter.
      */
     public void
-    Register(SegWriter *self, const String *api,
+    Register(SegWriter *self, String *api,
              decremented DataWriter *component);
 
     /** Retrieve a registered component.
@@ -74,7 +74,7 @@ public class Lucy::Index::SegWriter inherits Lucy::Index::DataWriter {
      * implements.
      */
     public nullable Obj*
-    Fetch(SegWriter *self, const String *api);
+    Fetch(SegWriter *self, String *api);
 
     /** Add a DataWriter to the SegWriter's stack of writers.
      */


Mime
View raw message