You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2014/04/23 16:45:13 UTC
[lucy-commits] [1/3] git commit: refs/heads/master - Global rename of "cnick" to
"nickname"
Repository: lucy
Updated Branches:
refs/heads/master 12104ffd6 -> d4282a9a2
Global rename of "cnick" to "nickname"
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/c3a9a7cc
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/c3a9a7cc
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/c3a9a7cc
Branch: refs/heads/master
Commit: c3a9a7cc689123b7415c6b4799cdd809418013fe
Parents: 12104ff
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Apr 23 16:37:40 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Apr 23 16:37:40 2014 +0200
----------------------------------------------------------------------
core/Lucy/Analysis/SnowballStemmer.cfh | 2 +-
core/Lucy/Analysis/SnowballStopFilter.cfh | 2 +-
core/Lucy/Index/BackgroundMerger.cfh | 2 +-
core/Lucy/Index/DeletionsReader.cfh | 6 +++---
core/Lucy/Index/DeletionsWriter.cfh | 4 ++--
core/Lucy/Index/DocReader.cfh | 2 +-
core/Lucy/Index/DocVector.cfh | 2 +-
core/Lucy/Index/HighlightReader.cfh | 6 +++---
core/Lucy/Index/HighlightWriter.cfh | 2 +-
core/Lucy/Index/IndexManager.cfh | 2 +-
core/Lucy/Index/IndexReader.cfh | 2 +-
core/Lucy/Index/Inverter.cfh | 2 +-
core/Lucy/Index/Lexicon.cfh | 2 +-
core/Lucy/Index/LexiconReader.cfh | 6 +++---
core/Lucy/Index/LexiconWriter.cfh | 2 +-
core/Lucy/Index/PolyLexicon.cfh | 4 ++--
core/Lucy/Index/Posting.cfh | 4 ++--
core/Lucy/Index/Posting/MatchPosting.cfh | 8 ++++----
core/Lucy/Index/Posting/RawPosting.cfh | 4 ++--
core/Lucy/Index/Posting/RichPosting.cfh | 4 ++--
core/Lucy/Index/Posting/ScorePosting.cfh | 4 ++--
core/Lucy/Index/PostingList.cfh | 2 +-
core/Lucy/Index/PostingListReader.cfh | 4 ++--
core/Lucy/Index/PostingListWriter.cfh | 2 +-
core/Lucy/Index/PostingPool.cfh | 2 +-
core/Lucy/Index/RawLexicon.cfh | 2 +-
core/Lucy/Index/RawPostingList.cfh | 2 +-
core/Lucy/Index/SegLexicon.cfh | 2 +-
core/Lucy/Index/SegPostingList.cfh | 2 +-
core/Lucy/Index/Segment.cfh | 2 +-
core/Lucy/Index/Similarity.cfh | 2 +-
core/Lucy/Index/SortCache/NumericSortCache.cfh | 10 +++++-----
core/Lucy/Index/SortReader.cfh | 2 +-
core/Lucy/Index/TermInfo.cfh | 2 +-
core/Lucy/Index/TermVector.cfh | 2 +-
core/Lucy/Index/ZombieKeyedHash.cfh | 2 +-
core/Lucy/Object/BitVector.cfh | 2 +-
core/Lucy/Object/I32Array.cfh | 2 +-
core/Lucy/Plan/Architecture.cfh | 2 +-
core/Lucy/Plan/FieldType.cfh | 2 +-
core/Lucy/Plan/NumericType.cfh | 2 +-
core/Lucy/Search/Collector.cfh | 6 +++---
core/Lucy/Search/Collector/SortCollector.cfh | 2 +-
core/Lucy/Search/HitQueue.cfh | 2 +-
core/Lucy/Search/IndexSearcher.cfh | 2 +-
core/Lucy/Search/QueryParser.cfh | 2 +-
core/Lucy/Search/RequiredOptionalMatcher.cfh | 2 +-
core/Lucy/Search/RequiredOptionalQuery.cfh | 4 ++--
core/Lucy/Store/CompoundFileReader.cfh | 4 ++--
core/Lucy/Store/CompoundFileWriter.cfh | 2 +-
core/Lucy/Store/DirHandle.cfh | 2 +-
core/Lucy/Store/FSDirHandle.cfh | 2 +-
core/Lucy/Store/FSFileHandle.cfh | 2 +-
core/Lucy/Store/FileHandle.cfh | 2 +-
core/Lucy/Store/Lock.cfh | 2 +-
core/Lucy/Store/LockFactory.cfh | 2 +-
core/Lucy/Store/RAMDirHandle.cfh | 2 +-
core/Lucy/Store/RAMFileHandle.cfh | 2 +-
core/Lucy/Store/SharedLock.cfh | 2 +-
core/Lucy/Test/Analysis/TestSnowballStemmer.cfh | 2 +-
core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh | 2 +-
core/Lucy/Test/Index/TestHighlightWriter.cfh | 2 +-
core/Lucy/Test/Index/TestIndexManager.cfh | 2 +-
core/Lucy/Test/Index/TestPostingListWriter.cfh | 2 +-
core/Lucy/Test/Index/TestSegment.cfh | 2 +-
core/Lucy/Test/Object/TestI32Array.cfh | 2 +-
core/Lucy/Test/Plan/TestArchitecture.cfh | 2 +-
core/Lucy/Test/Plan/TestFieldType.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParser.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParserLogic.cfh | 2 +-
core/Lucy/Test/Search/TestQueryParserSyntax.cfh | 2 +-
core/Lucy/Test/Store/TestCompoundFileReader.cfh | 2 +-
core/Lucy/Test/Store/TestCompoundFileWriter.cfh | 2 +-
core/Lucy/Test/Store/TestFSDirHandle.cfh | 2 +-
core/Lucy/Test/Store/TestFSFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestFileHandle.cfh | 2 +-
core/Lucy/Test/Store/TestRAMDirHandle.cfh | 2 +-
core/Lucy/Test/Store/TestRAMFileHandle.cfh | 2 +-
core/Lucy/Test/Util/TestIndexFileNames.cfh | 2 +-
core/Lucy/Test/Util/TestMemoryPool.cfh | 2 +-
core/Lucy/Test/Util/TestPriorityQueue.cfh | 4 ++--
core/Lucy/Util/IndexFileNames.cfh | 2 +-
core/Lucy/Util/MemoryPool.cfh | 2 +-
core/Lucy/Util/PriorityQueue.cfh | 2 +-
core/Lucy/Util/ProcessID.cfh | 2 +-
core/Lucy/Util/SortExternal.cfh | 2 +-
devel/conf/clownfish.vim | 2 +-
87 files changed, 112 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Analysis/SnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.cfh b/core/Lucy/Analysis/SnowballStemmer.cfh
index 83912da..4fe92a0 100644
--- a/core/Lucy/Analysis/SnowballStemmer.cfh
+++ b/core/Lucy/Analysis/SnowballStemmer.cfh
@@ -25,7 +25,7 @@ parcel Lucy;
* 'horsing'.
*/
-public class Lucy::Analysis::SnowballStemmer cnick SnowStemmer
+public class Lucy::Analysis::SnowballStemmer nickname SnowStemmer
inherits Lucy::Analysis::Analyzer {
void *snowstemmer;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Analysis/SnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.cfh b/core/Lucy/Analysis/SnowballStopFilter.cfh
index cf573bd..6d9f3dc 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.cfh
+++ b/core/Lucy/Analysis/SnowballStopFilter.cfh
@@ -54,7 +54,7 @@ parcel Lucy;
* |-----------------------|
*/
-public class Lucy::Analysis::SnowballStopFilter cnick SnowStop
+public class Lucy::Analysis::SnowballStopFilter nickname SnowStop
inherits Lucy::Analysis::Analyzer {
Hash *stoplist;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/BackgroundMerger.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/BackgroundMerger.cfh b/core/Lucy/Index/BackgroundMerger.cfh
index a0936dd..9804de8 100644
--- a/core/Lucy/Index/BackgroundMerger.cfh
+++ b/core/Lucy/Index/BackgroundMerger.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
* As with L<Indexer|Lucy::Index::Indexer>, see
* L<Lucy::Docs::FileLocking> if your index is on a shared volume.
*/
-public class Lucy::Index::BackgroundMerger cnick BGMerger
+public class Lucy::Index::BackgroundMerger nickname BGMerger
inherits Clownfish::Obj {
Schema *schema;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/DeletionsReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsReader.cfh b/core/Lucy/Index/DeletionsReader.cfh
index 00d9f44..5e82331 100644
--- a/core/Lucy/Index/DeletionsReader.cfh
+++ b/core/Lucy/Index/DeletionsReader.cfh
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Index::DeletionsReader cnick DelReader
+class Lucy::Index::DeletionsReader nickname DelReader
inherits Lucy::Index::DataReader {
inert DeletionsReader*
@@ -40,7 +40,7 @@ class Lucy::Index::DeletionsReader cnick DelReader
Aggregator(DeletionsReader *self, VArray *readers, I32Array *offsets);
}
-class Lucy::Index::PolyDeletionsReader cnick PolyDelReader
+class Lucy::Index::PolyDeletionsReader nickname PolyDelReader
inherits Lucy::Index::DeletionsReader {
VArray *readers;
@@ -66,7 +66,7 @@ class Lucy::Index::PolyDeletionsReader cnick PolyDelReader
Destroy(PolyDeletionsReader *self);
}
-class Lucy::Index::DefaultDeletionsReader cnick DefDelReader
+class Lucy::Index::DefaultDeletionsReader nickname DefDelReader
inherits Lucy::Index::DeletionsReader {
BitVector *deldocs;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/DeletionsWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.cfh b/core/Lucy/Index/DeletionsWriter.cfh
index 755465c..68a2ad5 100644
--- a/core/Lucy/Index/DeletionsWriter.cfh
+++ b/core/Lucy/Index/DeletionsWriter.cfh
@@ -31,7 +31,7 @@ parcel Lucy;
* merged into new ones.
*/
-public abstract class Lucy::Index::DeletionsWriter cnick DelWriter
+public abstract class Lucy::Index::DeletionsWriter nickname DelWriter
inherits Lucy::Index::DataWriter {
inert DeletionsWriter*
@@ -97,7 +97,7 @@ public abstract class Lucy::Index::DeletionsWriter cnick DelWriter
/** Implements DeletionsWriter using BitVector files.
*/
-class Lucy::Index::DefaultDeletionsWriter cnick DefDelWriter
+class Lucy::Index::DefaultDeletionsWriter nickname DefDelWriter
inherits Lucy::Index::DeletionsWriter {
VArray *seg_readers;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/DocReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocReader.cfh b/core/Lucy/Index/DocReader.cfh
index bf05b4f..b2d5b2f 100644
--- a/core/Lucy/Index/DocReader.cfh
+++ b/core/Lucy/Index/DocReader.cfh
@@ -69,7 +69,7 @@ class Lucy::Index::PolyDocReader inherits Lucy::Index::DocReader {
Destroy(PolyDocReader *self);
}
-class Lucy::Index::DefaultDocReader cnick DefDocReader
+class Lucy::Index::DefaultDocReader nickname DefDocReader
inherits Lucy::Index::DocReader {
InStream *dat_in;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/DocVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocVector.cfh b/core/Lucy/Index/DocVector.cfh
index 8ff0e83..0dde0a1 100644
--- a/core/Lucy/Index/DocVector.cfh
+++ b/core/Lucy/Index/DocVector.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** A collection of TermVectors.
*/
-class Lucy::Index::DocVector cnick DocVec
+class Lucy::Index::DocVector nickname DocVec
inherits Clownfish::Obj {
Hash *field_bufs;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/HighlightReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/HighlightReader.cfh b/core/Lucy/Index/HighlightReader.cfh
index 2259d7d..8568330 100644
--- a/core/Lucy/Index/HighlightReader.cfh
+++ b/core/Lucy/Index/HighlightReader.cfh
@@ -20,7 +20,7 @@ parcel Lucy;
*
* Read segment data used for creating highlighted excerpts.
*/
-class Lucy::Index::HighlightReader cnick HLReader
+class Lucy::Index::HighlightReader nickname HLReader
inherits Lucy::Index::DataReader {
inert HighlightReader*
@@ -37,7 +37,7 @@ class Lucy::Index::HighlightReader cnick HLReader
Aggregator(HighlightReader *self, VArray *readers, I32Array *offsets);
}
-class Lucy::Index::PolyHighlightReader cnick PolyHLReader
+class Lucy::Index::PolyHighlightReader nickname PolyHLReader
inherits Lucy::Index::HighlightReader {
VArray *readers;
@@ -59,7 +59,7 @@ class Lucy::Index::PolyHighlightReader cnick PolyHLReader
Destroy(PolyHighlightReader *self);
}
-class Lucy::Index::DefaultHighlightReader cnick DefHLReader
+class Lucy::Index::DefaultHighlightReader nickname DefHLReader
inherits Lucy::Index::HighlightReader {
InStream *ix_in;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/HighlightWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/HighlightWriter.cfh b/core/Lucy/Index/HighlightWriter.cfh
index b8f8efb..202509d 100644
--- a/core/Lucy/Index/HighlightWriter.cfh
+++ b/core/Lucy/Index/HighlightWriter.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** Add highlighting data to index.
*/
-class Lucy::Index::HighlightWriter cnick HLWriter
+class Lucy::Index::HighlightWriter nickname HLWriter
inherits Lucy::Index::DataWriter {
OutStream *ix_out;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/IndexManager.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexManager.cfh b/core/Lucy/Index/IndexManager.cfh
index 7dc5e8b..0c5d867 100644
--- a/core/Lucy/Index/IndexManager.cfh
+++ b/core/Lucy/Index/IndexManager.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
* which cannot change for the life of an index; IndexManager is used for
* defining rules which may change from process to process.
*/
-public class Lucy::Index::IndexManager cnick IxManager
+public class Lucy::Index::IndexManager nickname IxManager
inherits Clownfish::Obj {
Folder *folder;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/IndexReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/IndexReader.cfh b/core/Lucy/Index/IndexReader.cfh
index 1b647e9..80d7584 100644
--- a/core/Lucy/Index/IndexReader.cfh
+++ b/core/Lucy/Index/IndexReader.cfh
@@ -34,7 +34,7 @@ parcel Lucy;
* L<SegReader|Lucy::Index::SegReader>'s sub-components.
*/
-public class Lucy::Index::IndexReader cnick IxReader
+public class Lucy::Index::IndexReader nickname IxReader
inherits Lucy::Index::DataReader {
Hash *components;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Inverter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Inverter.cfh b/core/Lucy/Index/Inverter.cfh
index 9dab4e4..1f86238 100644
--- a/core/Lucy/Index/Inverter.cfh
+++ b/core/Lucy/Index/Inverter.cfh
@@ -141,7 +141,7 @@ class Lucy::Index::Inverter inherits Clownfish::Obj {
* Inverter needs to check certain field characteristics frequently. Since
* field definitions are unchanging, we cache them in an InverterEntry object.
*/
-final class Lucy::Index::Inverter::InverterEntry cnick InvEntry
+final class Lucy::Index::Inverter::InverterEntry nickname InvEntry
inherits Clownfish::Obj {
int32_t field_num;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Lexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Lexicon.cfh b/core/Lucy/Index/Lexicon.cfh
index 2372d71..4c05e33 100644
--- a/core/Lucy/Index/Lexicon.cfh
+++ b/core/Lucy/Index/Lexicon.cfh
@@ -31,7 +31,7 @@ parcel Lucy;
* three
*/
-public class Lucy::Index::Lexicon cnick Lex inherits Clownfish::Obj {
+public class Lucy::Index::Lexicon nickname Lex inherits Clownfish::Obj {
String *field;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/LexiconReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconReader.cfh b/core/Lucy/Index/LexiconReader.cfh
index cc7e01a..34ce352 100644
--- a/core/Lucy/Index/LexiconReader.cfh
+++ b/core/Lucy/Index/LexiconReader.cfh
@@ -20,7 +20,7 @@ parcel Lucy;
*
* LexiconReader reads term dictionary information.
*/
-public abstract class Lucy::Index::LexiconReader cnick LexReader
+public abstract class Lucy::Index::LexiconReader nickname LexReader
inherits Lucy::Index::DataReader {
inert LexiconReader*
@@ -58,7 +58,7 @@ public abstract class Lucy::Index::LexiconReader cnick LexReader
Aggregator(LexiconReader *self, VArray *readers, I32Array *offsets);
}
-class Lucy::Index::PolyLexiconReader cnick PolyLexReader
+class Lucy::Index::PolyLexiconReader nickname PolyLexReader
inherits Lucy::Index::LexiconReader {
VArray *readers;
@@ -83,7 +83,7 @@ class Lucy::Index::PolyLexiconReader cnick PolyLexReader
Destroy(PolyLexiconReader *self);
}
-class Lucy::Index::DefaultLexiconReader cnick DefLexReader
+class Lucy::Index::DefaultLexiconReader nickname DefLexReader
inherits Lucy::Index::LexiconReader {
VArray *lexicons;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/LexiconWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/LexiconWriter.cfh b/core/Lucy/Index/LexiconWriter.cfh
index b015a6d..06eedda 100644
--- a/core/Lucy/Index/LexiconWriter.cfh
+++ b/core/Lucy/Index/LexiconWriter.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Writer for a term dictionary.
*/
-class Lucy::Index::LexiconWriter cnick LexWriter
+class Lucy::Index::LexiconWriter nickname LexWriter
inherits Lucy::Index::DataWriter {
TermStepper *term_stepper;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/PolyLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PolyLexicon.cfh b/core/Lucy/Index/PolyLexicon.cfh
index 11b6d17..2700753 100644
--- a/core/Lucy/Index/PolyLexicon.cfh
+++ b/core/Lucy/Index/PolyLexicon.cfh
@@ -21,7 +21,7 @@ parcel Lucy;
* Interleaves the output of multiple SegLexicons.
*/
-class Lucy::Index::PolyLexicon cnick PolyLex
+class Lucy::Index::PolyLexicon nickname PolyLex
inherits Lucy::Index::Lexicon {
Obj *term;
@@ -54,7 +54,7 @@ class Lucy::Index::PolyLexicon cnick PolyLex
Destroy(PolyLexicon *self);
}
-class Lucy::Index::SegLexQueue cnick SegLexQ
+class Lucy::Index::SegLexQueue nickname SegLexQ
inherits Lucy::Util::PriorityQueue {
inert incremented SegLexQueue*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Posting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting.cfh b/core/Lucy/Index/Posting.cfh
index ac081fa..0adb476 100644
--- a/core/Lucy/Index/Posting.cfh
+++ b/core/Lucy/Index/Posting.cfh
@@ -27,7 +27,7 @@ parcel Lucy;
* posting format, and
* L<ScorePosting|Lucy::Index::Posting::ScorePosting>, the default.
*/
-class Lucy::Index::Posting cnick Post inherits Lucy::Util::Stepper {
+class Lucy::Index::Posting nickname Post inherits Lucy::Util::Stepper {
int32_t doc_id;
@@ -64,7 +64,7 @@ class Lucy::Index::Posting cnick Post inherits Lucy::Util::Stepper {
Compiler *compiler, bool need_score);
}
-abstract class Lucy::Index::Posting::PostingWriter cnick PostWriter
+abstract class Lucy::Index::Posting::PostingWriter nickname PostWriter
inherits Lucy::Index::DataWriter {
int32_t field_num;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Posting/MatchPosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/MatchPosting.cfh b/core/Lucy/Index/Posting/MatchPosting.cfh
index dcedd14..a92dd3d 100644
--- a/core/Lucy/Index/Posting/MatchPosting.cfh
+++ b/core/Lucy/Index/Posting/MatchPosting.cfh
@@ -23,7 +23,7 @@ parcel Lucy;
* category, but don't want the match to contribute to the document score, use
* MatchPosting for the field.
*/
-class Lucy::Index::Posting::MatchPosting cnick MatchPost
+class Lucy::Index::Posting::MatchPosting nickname MatchPost
inherits Lucy::Index::Posting {
Similarity *sim;
@@ -62,7 +62,7 @@ class Lucy::Index::Posting::MatchPosting cnick MatchPost
Compiler *compiler, bool need_score);
}
-class Lucy::Index::Posting::MatchPostingMatcher cnick MatchPostMatcher
+class Lucy::Index::Posting::MatchPostingMatcher nickname MatchPostMatcher
inherits Lucy::Search::TermMatcher {
inert MatchPostingMatcher*
@@ -73,7 +73,7 @@ class Lucy::Index::Posting::MatchPostingMatcher cnick MatchPostMatcher
Score(MatchPostingMatcher *self);
}
-class Lucy::Index::Posting::MatchPostingWriter cnick MatchPostWriter
+class Lucy::Index::Posting::MatchPostingWriter nickname MatchPostWriter
inherits Lucy::Index::Posting::PostingWriter {
OutStream *outstream;
@@ -101,7 +101,7 @@ class Lucy::Index::Posting::MatchPostingWriter cnick MatchPostWriter
}
class Lucy::Index::Posting::MatchPosting::MatchTermInfoStepper
- cnick MatchTInfoStepper inherits Lucy::Index::TermStepper {
+ nickname MatchTInfoStepper inherits Lucy::Index::TermStepper {
int32_t skip_interval;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Posting/RawPosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/RawPosting.cfh b/core/Lucy/Index/Posting/RawPosting.cfh
index e82c390..b57c285 100644
--- a/core/Lucy/Index/Posting/RawPosting.cfh
+++ b/core/Lucy/Index/Posting/RawPosting.cfh
@@ -36,7 +36,7 @@ parcel Lucy;
* file once the after the doc id is written.
*/
-class Lucy::Index::RawPosting cnick RawPost
+class Lucy::Index::RawPosting nickname RawPost
inherits Lucy::Index::Posting {
uint32_t freq;
@@ -65,7 +65,7 @@ class Lucy::Index::RawPosting cnick RawPost
Destroy(RawPosting *self);
}
-class Lucy::Index::Posting::RawPostingWriter cnick RawPostWriter
+class Lucy::Index::Posting::RawPostingWriter nickname RawPostWriter
inherits Lucy::Index::Posting::PostingWriter {
OutStream *outstream;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Posting/RichPosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/RichPosting.cfh b/core/Lucy/Index/Posting/RichPosting.cfh
index 34e9035..df75449 100644
--- a/core/Lucy/Index/Posting/RichPosting.cfh
+++ b/core/Lucy/Index/Posting/RichPosting.cfh
@@ -28,7 +28,7 @@ parcel Lucy;
* boost based on the visual size and weight of the marked up text: H1
* blocks get the greatest weight, H2 blocks almost as much, etc.
*/
-class Lucy::Index::Posting::RichPosting cnick RichPost
+class Lucy::Index::Posting::RichPosting nickname RichPost
inherits Lucy::Index::Posting::ScorePosting {
float *prox_boosts;
@@ -60,7 +60,7 @@ class Lucy::Index::Posting::RichPosting cnick RichPost
Compiler *compiler, bool need_score);
}
-class Lucy::Index::Posting::RichPostingMatcher cnick RichPostMatcher
+class Lucy::Index::Posting::RichPostingMatcher nickname RichPostMatcher
inherits Lucy::Index::Posting::ScorePostingMatcher {
inert RichPostingMatcher*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Posting/ScorePosting.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Posting/ScorePosting.cfh b/core/Lucy/Index/Posting/ScorePosting.cfh
index 754123f..5ed29e7 100644
--- a/core/Lucy/Index/Posting/ScorePosting.cfh
+++ b/core/Lucy/Index/Posting/ScorePosting.cfh
@@ -22,7 +22,7 @@ parcel Lucy;
* term-document pairing used by MatchPosting is supplemented by additional
* frequency, position, and weighting information.
*/
-class Lucy::Index::Posting::ScorePosting cnick ScorePost
+class Lucy::Index::Posting::ScorePosting nickname ScorePost
inherits Lucy::Index::Posting::MatchPosting {
float weight;
@@ -63,7 +63,7 @@ class Lucy::Index::Posting::ScorePosting cnick ScorePost
Get_Prox(ScorePosting *self);
}
-class Lucy::Index::Posting::ScorePostingMatcher cnick ScorePostMatcher
+class Lucy::Index::Posting::ScorePostingMatcher nickname ScorePostMatcher
inherits Lucy::Search::TermMatcher {
float *score_cache;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/PostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingList.cfh b/core/Lucy/Index/PostingList.cfh
index ac7d834..04c8a5b 100644
--- a/core/Lucy/Index/PostingList.cfh
+++ b/core/Lucy/Index/PostingList.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
* See L<Lucy::Docs::IRTheory> for definitions of "posting" and "posting
* list".
*/
-public class Lucy::Index::PostingList cnick PList
+public class Lucy::Index::PostingList nickname PList
inherits Lucy::Search::Matcher {
public inert PostingList*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/PostingListReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingListReader.cfh b/core/Lucy/Index/PostingListReader.cfh
index 9aef573..0f93526 100644
--- a/core/Lucy/Index/PostingListReader.cfh
+++ b/core/Lucy/Index/PostingListReader.cfh
@@ -21,7 +21,7 @@ parcel Lucy;
* PostingListReaders produce L<PostingList|Lucy::Index::PostingList>
* objects which convey document matching information.
*/
-public class Lucy::Index::PostingListReader cnick PListReader
+public class Lucy::Index::PostingListReader nickname PListReader
inherits Lucy::Index::DataReader {
inert PostingListReader*
@@ -50,7 +50,7 @@ public class Lucy::Index::PostingListReader cnick PListReader
Aggregator(PostingListReader *self, VArray *readers, I32Array *offsets);
}
-class Lucy::Index::DefaultPostingListReader cnick DefPListReader
+class Lucy::Index::DefaultPostingListReader nickname DefPListReader
inherits Lucy::Index::PostingListReader {
LexiconReader *lex_reader;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/PostingListWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingListWriter.cfh b/core/Lucy/Index/PostingListWriter.cfh
index f967259..f70e5ca 100644
--- a/core/Lucy/Index/PostingListWriter.cfh
+++ b/core/Lucy/Index/PostingListWriter.cfh
@@ -22,7 +22,7 @@ parcel Lucy;
* data to LexiconWriter.
*/
-class Lucy::Index::PostingListWriter cnick PListWriter
+class Lucy::Index::PostingListWriter nickname PListWriter
inherits Lucy::Index::DataWriter {
LexiconWriter *lex_writer;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/PostingPool.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/PostingPool.cfh b/core/Lucy/Index/PostingPool.cfh
index 590680c..be1d26a 100644
--- a/core/Lucy/Index/PostingPool.cfh
+++ b/core/Lucy/Index/PostingPool.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/**
* External sorter for raw postings.
*/
-class Lucy::Index::PostingPool cnick PostPool
+class Lucy::Index::PostingPool nickname PostPool
inherits Lucy::Util::SortExternal {
Schema *schema;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/RawLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawLexicon.cfh b/core/Lucy/Index/RawLexicon.cfh
index b0a8b3a..2dcaf7c 100644
--- a/core/Lucy/Index/RawLexicon.cfh
+++ b/core/Lucy/Index/RawLexicon.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Private scan-only Lexicon helper class.
*/
-class Lucy::Index::RawLexicon cnick RawLex
+class Lucy::Index::RawLexicon nickname RawLex
inherits Lucy::Index::Lexicon {
InStream *instream;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/RawPostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/RawPostingList.cfh b/core/Lucy/Index/RawPostingList.cfh
index 0ba119c..4936920 100644
--- a/core/Lucy/Index/RawPostingList.cfh
+++ b/core/Lucy/Index/RawPostingList.cfh
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Index::RawPostingList cnick RawPList
+class Lucy::Index::RawPostingList nickname RawPList
inherits Lucy::Index::PostingList {
Posting *posting;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/SegLexicon.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegLexicon.cfh b/core/Lucy/Index/SegLexicon.cfh
index dd25b05..d152d5c 100644
--- a/core/Lucy/Index/SegLexicon.cfh
+++ b/core/Lucy/Index/SegLexicon.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** Single-segment Lexicon.
*/
-class Lucy::Index::SegLexicon cnick SegLex
+class Lucy::Index::SegLexicon nickname SegLex
inherits Lucy::Index::Lexicon {
Segment *segment;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/SegPostingList.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SegPostingList.cfh b/core/Lucy/Index/SegPostingList.cfh
index 8209fb4..bf2cc3f 100644
--- a/core/Lucy/Index/SegPostingList.cfh
+++ b/core/Lucy/Index/SegPostingList.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** Single-segment PostingList.
*/
-class Lucy::Index::SegPostingList cnick SegPList
+class Lucy::Index::SegPostingList nickname SegPList
inherits Lucy::Index::PostingList {
PostingListReader *plist_reader;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Segment.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Segment.cfh b/core/Lucy/Index/Segment.cfh
index a1438a3..527bae0 100644
--- a/core/Lucy/Index/Segment.cfh
+++ b/core/Lucy/Index/Segment.cfh
@@ -31,7 +31,7 @@ parcel Lucy;
* storing metadata themselves.
*/
-public class Lucy::Index::Segment cnick Seg inherits Clownfish::Obj {
+public class Lucy::Index::Segment nickname Seg inherits Clownfish::Obj {
String *name;
int64_t count;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/Similarity.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Similarity.cfh b/core/Lucy/Index/Similarity.cfh
index ca523aa..4798fb3 100644
--- a/core/Lucy/Index/Similarity.cfh
+++ b/core/Lucy/Index/Similarity.cfh
@@ -33,7 +33,7 @@ parcel Lucy;
* scores from multiple fields.
*/
-public class Lucy::Index::Similarity cnick Sim inherits Clownfish::Obj {
+public class Lucy::Index::Similarity nickname Sim inherits Clownfish::Obj {
float *norm_decoder;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/SortCache/NumericSortCache.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache/NumericSortCache.cfh b/core/Lucy/Index/SortCache/NumericSortCache.cfh
index 3d23200..70d8950 100644
--- a/core/Lucy/Index/SortCache/NumericSortCache.cfh
+++ b/core/Lucy/Index/SortCache/NumericSortCache.cfh
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Index::SortCache::NumericSortCache cnick NumSortCache
+class Lucy::Index::SortCache::NumericSortCache nickname NumSortCache
inherits Lucy::Index::SortCache {
InStream *ord_in;
@@ -31,7 +31,7 @@ class Lucy::Index::SortCache::NumericSortCache cnick NumSortCache
Destroy(NumericSortCache *self);
}
-class Lucy::Index::SortCache::Float64SortCache cnick F64SortCache
+class Lucy::Index::SortCache::Float64SortCache nickname F64SortCache
inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Float64SortCache*
@@ -48,7 +48,7 @@ class Lucy::Index::SortCache::Float64SortCache cnick F64SortCache
Value(Float64SortCache *self, int32_t ord);
}
-class Lucy::Index::SortCache::Float32SortCache cnick F32SortCache
+class Lucy::Index::SortCache::Float32SortCache nickname F32SortCache
inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Float32SortCache*
@@ -65,7 +65,7 @@ class Lucy::Index::SortCache::Float32SortCache cnick F32SortCache
Value(Float32SortCache *self, int32_t ord);
}
-class Lucy::Index::SortCache::Int32SortCache cnick I32SortCache
+class Lucy::Index::SortCache::Int32SortCache nickname I32SortCache
inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Int32SortCache*
@@ -82,7 +82,7 @@ class Lucy::Index::SortCache::Int32SortCache cnick I32SortCache
Value(Int32SortCache *self, int32_t ord);
}
-class Lucy::Index::SortCache::Int64SortCache cnick I64SortCache
+class Lucy::Index::SortCache::Int64SortCache nickname I64SortCache
inherits Lucy::Index::SortCache::NumericSortCache {
public inert incremented Int64SortCache*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/SortReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortReader.cfh b/core/Lucy/Index/SortReader.cfh
index db433c0..34e5f99 100644
--- a/core/Lucy/Index/SortReader.cfh
+++ b/core/Lucy/Index/SortReader.cfh
@@ -37,7 +37,7 @@ abstract class Lucy::Index::SortReader
}
-class Lucy::Index::DefaultSortReader cnick DefSortReader
+class Lucy::Index::DefaultSortReader nickname DefSortReader
inherits Lucy::Index::SortReader {
Hash *caches;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/TermInfo.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/TermInfo.cfh b/core/Lucy/Index/TermInfo.cfh
index 89cb29b..85c64c5 100644
--- a/core/Lucy/Index/TermInfo.cfh
+++ b/core/Lucy/Index/TermInfo.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
* .lexx stream; it is a filepointer to a locations in the main .lex file.
*/
-class Lucy::Index::TermInfo cnick TInfo inherits Clownfish::Obj {
+class Lucy::Index::TermInfo nickname TInfo inherits Clownfish::Obj {
int32_t doc_freq;
int64_t post_filepos;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/TermVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/TermVector.cfh b/core/Lucy/Index/TermVector.cfh
index aed47df..3173d42 100644
--- a/core/Lucy/Index/TermVector.cfh
+++ b/core/Lucy/Index/TermVector.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** Term freq and positional data.
*/
-class Lucy::Index::TermVector cnick TV
+class Lucy::Index::TermVector nickname TV
inherits Clownfish::Obj {
String *field;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Index/ZombieKeyedHash.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/ZombieKeyedHash.cfh b/core/Lucy/Index/ZombieKeyedHash.cfh
index e31b2c6..a82dcbc 100644
--- a/core/Lucy/Index/ZombieKeyedHash.cfh
+++ b/core/Lucy/Index/ZombieKeyedHash.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Hash which creates keys allocated from a MemoryPool rather than malloc.
*/
-class Lucy::Index::SortFieldWriter::ZombieKeyedHash cnick ZKHash
+class Lucy::Index::SortFieldWriter::ZombieKeyedHash nickname ZKHash
inherits Clownfish::Hash {
MemoryPool *mem_pool;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Object/BitVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/BitVector.cfh b/core/Lucy/Object/BitVector.cfh
index e0ade93..0079904 100644
--- a/core/Lucy/Object/BitVector.cfh
+++ b/core/Lucy/Object/BitVector.cfh
@@ -21,7 +21,7 @@ parcel Lucy;
* BitVector is a growable array of bits. All bits are initially zero.
*/
-public class Lucy::Object::BitVector cnick BitVec
+public class Lucy::Object::BitVector nickname BitVec
inherits Clownfish::Obj {
uint32_t cap;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Object/I32Array.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/I32Array.cfh b/core/Lucy/Object/I32Array.cfh
index 78650d6..63be523 100644
--- a/core/Lucy/Object/I32Array.cfh
+++ b/core/Lucy/Object/I32Array.cfh
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Object::I32Array cnick I32Arr inherits Clownfish::Obj {
+class Lucy::Object::I32Array nickname I32Arr inherits Clownfish::Obj {
int32_t *ints;
uint32_t size;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Plan/Architecture.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/Architecture.cfh b/core/Lucy/Plan/Architecture.cfh
index 7aafa7b..d35f5bf 100644
--- a/core/Lucy/Plan/Architecture.cfh
+++ b/core/Lucy/Plan/Architecture.cfh
@@ -25,7 +25,7 @@ parcel Lucy;
* L<SegWriter|Lucy::Index::SegWriter> and
* L<SegReader|Lucy::Index::SegReader>.
*/
-public class Lucy::Plan::Architecture cnick Arch inherits Clownfish::Obj {
+public class Lucy::Plan::Architecture nickname Arch inherits Clownfish::Obj {
public inert incremented Architecture*
new();
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Plan/FieldType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FieldType.cfh b/core/Lucy/Plan/FieldType.cfh
index 94859c5..e645b78 100644
--- a/core/Lucy/Plan/FieldType.cfh
+++ b/core/Lucy/Plan/FieldType.cfh
@@ -69,7 +69,7 @@ __END_C__
* and scoring behavior for the field. It is required if the field is
* <code>indexed</code>.
*/
-public abstract class Lucy::Plan::FieldType cnick FType
+public abstract class Lucy::Plan::FieldType nickname FType
inherits Clownfish::Obj {
float boost;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Plan/NumericType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/NumericType.cfh b/core/Lucy/Plan/NumericType.cfh
index 5565341..8c83b4a 100644
--- a/core/Lucy/Plan/NumericType.cfh
+++ b/core/Lucy/Plan/NumericType.cfh
@@ -16,7 +16,7 @@
parcel Lucy;
-class Lucy::Plan::NumericType cnick NumType inherits Lucy::Plan::FieldType {
+class Lucy::Plan::NumericType nickname NumType inherits Lucy::Plan::FieldType {
public inert NumericType*
init(NumericType *self);
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/Collector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Collector.cfh b/core/Lucy/Search/Collector.cfh
index abeafeb..97c83f0 100644
--- a/core/Lucy/Search/Collector.cfh
+++ b/core/Lucy/Search/Collector.cfh
@@ -28,7 +28,7 @@ parcel Lucy;
* collector must take the updated information into account.
*/
-public abstract class Lucy::Search::Collector cnick Coll
+public abstract class Lucy::Search::Collector nickname Coll
inherits Clownfish::Obj {
SegReader *reader;
@@ -80,7 +80,7 @@ public abstract class Lucy::Search::Collector cnick Coll
* L<BitVector|Lucy::Object::BitVector>. It is useful for recording the
* entire set of documents which matches a query.
*/
-public class Lucy::Search::Collector::BitCollector cnick BitColl
+public class Lucy::Search::Collector::BitCollector nickname BitColl
inherits Lucy::Search::Collector {
BitVector *bit_vec;
@@ -105,7 +105,7 @@ public class Lucy::Search::Collector::BitCollector cnick BitColl
Need_Score(BitCollector *self);
}
-class Lucy::Search::Collector::OffsetCollector cnick OffsetColl
+class Lucy::Search::Collector::OffsetCollector nickname OffsetColl
inherits Lucy::Search::Collector {
int32_t offset;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/Collector/SortCollector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Collector/SortCollector.cfh b/core/Lucy/Search/Collector/SortCollector.cfh
index dd89e9b..f4e8346 100644
--- a/core/Lucy/Search/Collector/SortCollector.cfh
+++ b/core/Lucy/Search/Collector/SortCollector.cfh
@@ -21,7 +21,7 @@ parcel Lucy;
* A SortCollector sorts hits according to a SortSpec, keeping the highest
* ranking N documents in a priority queue.
*/
-class Lucy::Search::Collector::SortCollector cnick SortColl
+class Lucy::Search::Collector::SortCollector nickname SortColl
inherits Lucy::Search::Collector {
uint32_t wanted;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/HitQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/HitQueue.cfh b/core/Lucy/Search/HitQueue.cfh
index fa8a049..d76e6b8 100644
--- a/core/Lucy/Search/HitQueue.cfh
+++ b/core/Lucy/Search/HitQueue.cfh
@@ -22,7 +22,7 @@ parcel Lucy;
* float to the top of the queue and poor matches fall out the bottom.
*/
-class Lucy::Search::HitQueue cnick HitQ
+class Lucy::Search::HitQueue nickname HitQ
inherits Lucy::Util::PriorityQueue {
FieldType **field_types;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/IndexSearcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/IndexSearcher.cfh b/core/Lucy/Search/IndexSearcher.cfh
index 18f5ab1..2f74b25 100644
--- a/core/Lucy/Search/IndexSearcher.cfh
+++ b/core/Lucy/Search/IndexSearcher.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
* L<Snapshot|Lucy::Index::Snapshot> of the index. If an index is
* modified, a new IndexSearcher must be opened to access the changes.
*/
-public class Lucy::Search::IndexSearcher cnick IxSearcher
+public class Lucy::Search::IndexSearcher nickname IxSearcher
inherits Lucy::Search::Searcher {
IndexReader *reader;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/QueryParser.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.cfh b/core/Lucy/Search/QueryParser.cfh
index 50329fa..89618f0 100644
--- a/core/Lucy/Search/QueryParser.cfh
+++ b/core/Lucy/Search/QueryParser.cfh
@@ -40,7 +40,7 @@ parcel Lucy;
*
*
*/
-public class Lucy::Search::QueryParser cnick QParser
+public class Lucy::Search::QueryParser nickname QParser
inherits Clownfish::Obj {
Schema *schema;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/RequiredOptionalMatcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RequiredOptionalMatcher.cfh b/core/Lucy/Search/RequiredOptionalMatcher.cfh
index 84fb254..4a86d93 100644
--- a/core/Lucy/Search/RequiredOptionalMatcher.cfh
+++ b/core/Lucy/Search/RequiredOptionalMatcher.cfh
@@ -19,7 +19,7 @@ parcel Lucy;
/** Intersect required and optional Matchers.
*/
-class Lucy::Search::RequiredOptionalMatcher cnick ReqOptMatcher
+class Lucy::Search::RequiredOptionalMatcher nickname ReqOptMatcher
inherits Lucy::Search::PolyMatcher {
Matcher *req_matcher;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Search/RequiredOptionalQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RequiredOptionalQuery.cfh b/core/Lucy/Search/RequiredOptionalQuery.cfh
index d136b68..9dc20f7 100644
--- a/core/Lucy/Search/RequiredOptionalQuery.cfh
+++ b/core/Lucy/Search/RequiredOptionalQuery.cfh
@@ -23,7 +23,7 @@ parcel Lucy;
* its score is passed along; when both match, the scores are summed.
*/
-public class Lucy::Search::RequiredOptionalQuery cnick ReqOptQuery
+public class Lucy::Search::RequiredOptionalQuery nickname ReqOptQuery
inherits Lucy::Search::PolyQuery {
inert incremented RequiredOptionalQuery*
@@ -64,7 +64,7 @@ public class Lucy::Search::RequiredOptionalQuery cnick ReqOptQuery
Equals(RequiredOptionalQuery *self, Obj *other);
}
-class Lucy::Search::RequiredOptionalCompiler cnick ReqOptCompiler
+class Lucy::Search::RequiredOptionalCompiler nickname ReqOptCompiler
inherits Lucy::Search::PolyCompiler {
inert incremented RequiredOptionalCompiler*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/CompoundFileReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileReader.cfh b/core/Lucy/Store/CompoundFileReader.cfh
index e7cafc4..425dce0 100644
--- a/core/Lucy/Store/CompoundFileReader.cfh
+++ b/core/Lucy/Store/CompoundFileReader.cfh
@@ -30,7 +30,7 @@ parcel Lucy;
* available filehandles.
*/
-class Lucy::Store::CompoundFileReader cnick CFReader
+class Lucy::Store::CompoundFileReader nickname CFReader
inherits Lucy::Store::Folder {
Folder *real_folder;
@@ -88,7 +88,7 @@ class Lucy::Store::CompoundFileReader cnick CFReader
/** DirHandle for CompoundFileReader.
*/
-class Lucy::Store::CFReaderDirHandle cnick CFReaderDH
+class Lucy::Store::CFReaderDirHandle nickname CFReaderDH
inherits Lucy::Store::DirHandle {
CompoundFileReader *cf_reader;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/CompoundFileWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/CompoundFileWriter.cfh b/core/Lucy/Store/CompoundFileWriter.cfh
index 9ead6de..fe77743 100644
--- a/core/Lucy/Store/CompoundFileWriter.cfh
+++ b/core/Lucy/Store/CompoundFileWriter.cfh
@@ -29,7 +29,7 @@ parcel Lucy;
* Any given directory may only be consolidated once.
*/
-class Lucy::Store::CompoundFileWriter cnick CFWriter
+class Lucy::Store::CompoundFileWriter nickname CFWriter
inherits Clownfish::Obj {
Folder *folder;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/DirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/DirHandle.cfh b/core/Lucy/Store/DirHandle.cfh
index 436c450..e8924d8 100644
--- a/core/Lucy/Store/DirHandle.cfh
+++ b/core/Lucy/Store/DirHandle.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Iterate over the files in a directory.
*/
-abstract class Lucy::Store::DirHandle cnick DH
+abstract class Lucy::Store::DirHandle nickname DH
inherits Clownfish::Obj {
String *dir;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/FSDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSDirHandle.cfh b/core/Lucy/Store/FSDirHandle.cfh
index e0e2d61..7e35405 100644
--- a/core/Lucy/Store/FSDirHandle.cfh
+++ b/core/Lucy/Store/FSDirHandle.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** File system DirHandle.
*/
-class Lucy::Store::FSDirHandle cnick FSDH
+class Lucy::Store::FSDirHandle nickname FSDH
inherits Lucy::Store::DirHandle {
void *sys_dirhandle;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/FSFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFileHandle.cfh b/core/Lucy/Store/FSFileHandle.cfh
index cbe6a7d..25a3a65 100644
--- a/core/Lucy/Store/FSFileHandle.cfh
+++ b/core/Lucy/Store/FSFileHandle.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** File system FileHandle.
*/
-class Lucy::Store::FSFileHandle cnick FSFH
+class Lucy::Store::FSFileHandle nickname FSFH
inherits Lucy::Store::FileHandle {
int fd;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/FileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FileHandle.cfh b/core/Lucy/Store/FileHandle.cfh
index 01b3691..72d1c2c 100644
--- a/core/Lucy/Store/FileHandle.cfh
+++ b/core/Lucy/Store/FileHandle.cfh
@@ -32,7 +32,7 @@ parcel Lucy;
* already exists.
*/
-abstract class Lucy::Store::FileHandle cnick FH
+abstract class Lucy::Store::FileHandle nickname FH
inherits Clownfish::Obj {
String *path;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/Lock.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/Lock.cfh b/core/Lucy/Store/Lock.cfh
index 08dc94b..33f2bde 100644
--- a/core/Lucy/Store/Lock.cfh
+++ b/core/Lucy/Store/Lock.cfh
@@ -110,7 +110,7 @@ public abstract class Lucy::Store::Lock inherits Clownfish::Obj {
Destroy(Lock *self);
}
-class Lucy::Store::LockFileLock cnick LFLock
+class Lucy::Store::LockFileLock nickname LFLock
inherits Lucy::Store::Lock {
String *link_path;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/LockFactory.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/LockFactory.cfh b/core/Lucy/Store/LockFactory.cfh
index d9ab93d..5cf8232 100644
--- a/core/Lucy/Store/LockFactory.cfh
+++ b/core/Lucy/Store/LockFactory.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
* alternatives such as flock() are possible.
*/
-public class Lucy::Store::LockFactory cnick LockFact
+public class Lucy::Store::LockFactory nickname LockFact
inherits Clownfish::Obj {
Folder *folder;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/RAMDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMDirHandle.cfh b/core/Lucy/Store/RAMDirHandle.cfh
index 2d097eb..2d9e545 100644
--- a/core/Lucy/Store/RAMDirHandle.cfh
+++ b/core/Lucy/Store/RAMDirHandle.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** DirHandle for RAMFolder.
*/
-class Lucy::Store::RAMDirHandle cnick RAMDH
+class Lucy::Store::RAMDirHandle nickname RAMDH
inherits Lucy::Store::DirHandle {
RAMFolder *folder;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/RAMFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFileHandle.cfh b/core/Lucy/Store/RAMFileHandle.cfh
index c7660e1..51469f6 100644
--- a/core/Lucy/Store/RAMFileHandle.cfh
+++ b/core/Lucy/Store/RAMFileHandle.cfh
@@ -21,7 +21,7 @@ parcel Lucy;
* RAM-based implementation of FileHandle, to be used in conjunction with
* RAMFolder.
*/
-class Lucy::Store::RAMFileHandle cnick RAMFH
+class Lucy::Store::RAMFileHandle nickname RAMFH
inherits Lucy::Store::FileHandle {
RAMFile *ram_file;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Store/SharedLock.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/SharedLock.cfh b/core/Lucy/Store/SharedLock.cfh
index a9b741c..df08809 100644
--- a/core/Lucy/Store/SharedLock.cfh
+++ b/core/Lucy/Store/SharedLock.cfh
@@ -38,7 +38,7 @@ parcel Lucy;
* SharedLock is considered fully released when no lock files with a given
* lock name are left.
*/
-class Lucy::Store::SharedLock cnick ShLock
+class Lucy::Store::SharedLock nickname ShLock
inherits Lucy::Store::LockFileLock {
inert incremented SharedLock*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh b/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
index 6260b13..7c37248 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
+++ b/core/Lucy/Test/Analysis/TestSnowballStemmer.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Analysis::TestSnowballStemmer cnick TestSnowStemmer
+class Lucy::Test::Analysis::TestSnowballStemmer nickname TestSnowStemmer
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestSnowballStemmer*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh b/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
index 63494f2..c916694 100644
--- a/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
+++ b/core/Lucy/Test/Analysis/TestSnowballStopFilter.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Analysis::TestSnowballStopFilter cnick TestSnowStop
+class Lucy::Test::Analysis::TestSnowballStopFilter nickname TestSnowStop
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestSnowballStopFilter*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Index/TestHighlightWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestHighlightWriter.cfh b/core/Lucy/Test/Index/TestHighlightWriter.cfh
index cb8ce9f..aad78d7 100644
--- a/core/Lucy/Test/Index/TestHighlightWriter.cfh
+++ b/core/Lucy/Test/Index/TestHighlightWriter.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Index::TestHighlightWriter cnick TestHLWriter
+class Lucy::Test::Index::TestHighlightWriter nickname TestHLWriter
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestHighlightWriter*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Index/TestIndexManager.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestIndexManager.cfh b/core/Lucy/Test/Index/TestIndexManager.cfh
index 5b2c2e1..fc0557e 100644
--- a/core/Lucy/Test/Index/TestIndexManager.cfh
+++ b/core/Lucy/Test/Index/TestIndexManager.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Index::TestIndexManager cnick TestIxManager
+class Lucy::Test::Index::TestIndexManager nickname TestIxManager
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestIndexManager*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Index/TestPostingListWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestPostingListWriter.cfh b/core/Lucy/Test/Index/TestPostingListWriter.cfh
index 14ef955..b9c106c 100644
--- a/core/Lucy/Test/Index/TestPostingListWriter.cfh
+++ b/core/Lucy/Test/Index/TestPostingListWriter.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Index::TestPostingListWriter cnick TestPListWriter
+class Lucy::Test::Index::TestPostingListWriter nickname TestPListWriter
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestPostingListWriter*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Index/TestSegment.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Index/TestSegment.cfh b/core/Lucy/Test/Index/TestSegment.cfh
index 609a961..c3101d6 100644
--- a/core/Lucy/Test/Index/TestSegment.cfh
+++ b/core/Lucy/Test/Index/TestSegment.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Index::TestSegment cnick TestSeg
+class Lucy::Test::Index::TestSegment nickname TestSeg
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestSegment*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Object/TestI32Array.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Object/TestI32Array.cfh b/core/Lucy/Test/Object/TestI32Array.cfh
index c6411aa..dceba6b 100644
--- a/core/Lucy/Test/Object/TestI32Array.cfh
+++ b/core/Lucy/Test/Object/TestI32Array.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Object::TestI32Array cnick TestI32Arr
+class Lucy::Test::Object::TestI32Array nickname TestI32Arr
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestI32Array*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Plan/TestArchitecture.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestArchitecture.cfh b/core/Lucy/Test/Plan/TestArchitecture.cfh
index 9d227e1..d86b1b8 100644
--- a/core/Lucy/Test/Plan/TestArchitecture.cfh
+++ b/core/Lucy/Test/Plan/TestArchitecture.cfh
@@ -20,7 +20,7 @@ parcel TestLucy;
* Returns absurdly low values for Index_Interval() and Skip_Interval().
*/
-class Lucy::Test::Plan::TestArchitecture cnick TestArch
+class Lucy::Test::Plan::TestArchitecture nickname TestArch
inherits Lucy::Plan::Architecture {
inert incremented TestArchitecture*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Plan/TestFieldType.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Plan/TestFieldType.cfh b/core/Lucy/Test/Plan/TestFieldType.cfh
index 473e5a0..a82c640 100644
--- a/core/Lucy/Test/Plan/TestFieldType.cfh
+++ b/core/Lucy/Test/Plan/TestFieldType.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Plan::TestFieldType cnick TestFType
+class Lucy::Test::Plan::TestFieldType nickname TestFType
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestFieldType*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Search/TestQueryParser.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParser.cfh b/core/Lucy/Test/Search/TestQueryParser.cfh
index c5296e5..76ed047 100644
--- a/core/Lucy/Test/Search/TestQueryParser.cfh
+++ b/core/Lucy/Test/Search/TestQueryParser.cfh
@@ -19,7 +19,7 @@ parcel TestLucy;
/** Test case object for QueryParser unit tests.
*/
-class Lucy::Test::Search::TestQueryParser cnick TestQP
+class Lucy::Test::Search::TestQueryParser nickname TestQP
inherits Clownfish::Obj {
String *query_string;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Search/TestQueryParserLogic.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserLogic.cfh b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
index 45052b6..a0b1a75 100644
--- a/core/Lucy/Test/Search/TestQueryParserLogic.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserLogic.cfh
@@ -19,7 +19,7 @@ parcel TestLucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
-class Lucy::Test::Search::TestQueryParserLogic cnick TestQPLogic
+class Lucy::Test::Search::TestQueryParserLogic nickname TestQPLogic
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestQueryParserLogic*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
index 893dc06..dee071c 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.cfh
@@ -19,7 +19,7 @@ parcel TestLucy;
/** Tests for logical structure of Query objects output by QueryParser.
*/
-class Lucy::Test::Search::TestQueryParserSyntax cnick TestQPSyntax
+class Lucy::Test::Search::TestQueryParserSyntax nickname TestQPSyntax
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestQueryParserSyntax*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestCompoundFileReader.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileReader.cfh b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
index 24f976b..69af74d 100644
--- a/core/Lucy/Test/Store/TestCompoundFileReader.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileReader.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestCompoundFileReader cnick TestCFReader
+class Lucy::Test::Store::TestCompoundFileReader nickname TestCFReader
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestCompoundFileReader*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
index 7f01e8f..051ad65 100644
--- a/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
+++ b/core/Lucy/Test/Store/TestCompoundFileWriter.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestCompoundFileWriter cnick TestCFWriter
+class Lucy::Test::Store::TestCompoundFileWriter nickname TestCFWriter
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestCompoundFileWriter*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestFSDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSDirHandle.cfh b/core/Lucy/Test/Store/TestFSDirHandle.cfh
index 69247b3..9b10d79 100644
--- a/core/Lucy/Test/Store/TestFSDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSDirHandle.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestFSDirHandle cnick TestFSDH
+class Lucy::Test::Store::TestFSDirHandle nickname TestFSDH
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestFSDirHandle*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestFSFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFileHandle.cfh b/core/Lucy/Test/Store/TestFSFileHandle.cfh
index a9676a2..b9825b8 100644
--- a/core/Lucy/Test/Store/TestFSFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFSFileHandle.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestFSFileHandle cnick TestFSFH
+class Lucy::Test::Store::TestFSFileHandle nickname TestFSFH
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestFSFileHandle*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFileHandle.cfh b/core/Lucy/Test/Store/TestFileHandle.cfh
index e7bd28b..1c97c5f 100644
--- a/core/Lucy/Test/Store/TestFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestFileHandle.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestFileHandle cnick TestFH
+class Lucy::Test::Store::TestFileHandle nickname TestFH
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestFileHandle*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestRAMDirHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMDirHandle.cfh b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
index 31e242a..4adfb31 100644
--- a/core/Lucy/Test/Store/TestRAMDirHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMDirHandle.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestRAMDirHandle cnick TestRAMDH
+class Lucy::Test::Store::TestRAMDirHandle nickname TestRAMDH
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestRAMDirHandle*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Store/TestRAMFileHandle.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestRAMFileHandle.cfh b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
index a795d23..d5418cf 100644
--- a/core/Lucy/Test/Store/TestRAMFileHandle.cfh
+++ b/core/Lucy/Test/Store/TestRAMFileHandle.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Store::TestRAMFileHandle cnick TestRAMFH
+class Lucy::Test::Store::TestRAMFileHandle nickname TestRAMFH
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestRAMFileHandle*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Util/TestIndexFileNames.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestIndexFileNames.cfh b/core/Lucy/Test/Util/TestIndexFileNames.cfh
index e098c72..c5ec962 100644
--- a/core/Lucy/Test/Util/TestIndexFileNames.cfh
+++ b/core/Lucy/Test/Util/TestIndexFileNames.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Util::TestIndexFileNames cnick TestIxFileNames
+class Lucy::Test::Util::TestIndexFileNames nickname TestIxFileNames
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestIndexFileNames*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Util/TestMemoryPool.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestMemoryPool.cfh b/core/Lucy/Test/Util/TestMemoryPool.cfh
index f7ba344..f3d2433 100644
--- a/core/Lucy/Test/Util/TestMemoryPool.cfh
+++ b/core/Lucy/Test/Util/TestMemoryPool.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Util::TestMemoryPool cnick TestMemPool
+class Lucy::Test::Util::TestMemoryPool nickname TestMemPool
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestMemoryPool*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Test/Util/TestPriorityQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.cfh b/core/Lucy/Test/Util/TestPriorityQueue.cfh
index 296c2f7..4f434f1 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.cfh
+++ b/core/Lucy/Test/Util/TestPriorityQueue.cfh
@@ -16,7 +16,7 @@
parcel TestLucy;
-class Lucy::Test::Util::NumPriorityQueue cnick NumPriQ
+class Lucy::Test::Util::NumPriorityQueue nickname NumPriQ
inherits Lucy::Util::PriorityQueue {
inert incremented NumPriorityQueue*
@@ -26,7 +26,7 @@ class Lucy::Test::Util::NumPriorityQueue cnick NumPriQ
Less_Than(NumPriorityQueue *self, Obj *a, Obj *b);
}
-class Lucy::Test::Util::TestPriorityQueue cnick TestPriQ
+class Lucy::Test::Util::TestPriorityQueue nickname TestPriQ
inherits Clownfish::TestHarness::TestBatch {
inert incremented TestPriorityQueue*
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Util/IndexFileNames.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/IndexFileNames.cfh b/core/Lucy/Util/IndexFileNames.cfh
index 3e7ee7f..d74f37b 100644
--- a/core/Lucy/Util/IndexFileNames.cfh
+++ b/core/Lucy/Util/IndexFileNames.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Utilities for parsing, interpreting and generating index file names.
*/
-inert class Lucy::Util::IndexFileNames cnick IxFileNames {
+inert class Lucy::Util::IndexFileNames nickname IxFileNames {
/** Skip past the first instance of an underscore in the String, then
* attempt to decode a base 36 number. For example, "snapshot_5.json"
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Util/MemoryPool.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/MemoryPool.cfh b/core/Lucy/Util/MemoryPool.cfh
index 02af3f2..8301464 100644
--- a/core/Lucy/Util/MemoryPool.cfh
+++ b/core/Lucy/Util/MemoryPool.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
* class to specific applications.
*/
-class Lucy::Util::MemoryPool cnick MemPool
+class Lucy::Util::MemoryPool nickname MemPool
inherits Clownfish::Obj {
uint32_t arena_size;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Util/PriorityQueue.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/PriorityQueue.cfh b/core/Lucy/Util/PriorityQueue.cfh
index 86acd8d..2480bb5 100644
--- a/core/Lucy/Util/PriorityQueue.cfh
+++ b/core/Lucy/Util/PriorityQueue.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
* Subclasses must define the abstract method Less_Than.
*/
-class Lucy::Util::PriorityQueue cnick PriQ
+class Lucy::Util::PriorityQueue nickname PriQ
inherits Clownfish::Obj {
uint32_t size;
uint32_t max_size;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Util/ProcessID.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/ProcessID.cfh b/core/Lucy/Util/ProcessID.cfh
index 7dbc9b1..9b917de 100644
--- a/core/Lucy/Util/ProcessID.cfh
+++ b/core/Lucy/Util/ProcessID.cfh
@@ -18,7 +18,7 @@ parcel Lucy;
/** Provide platform-compatible process ID functions.
*/
-inert class Lucy::Util::ProcessID cnick PID {
+inert class Lucy::Util::ProcessID nickname PID {
/** Return the ID for the current process.
*/
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/core/Lucy/Util/SortExternal.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/SortExternal.cfh b/core/Lucy/Util/SortExternal.cfh
index cb5779e..c414140 100644
--- a/core/Lucy/Util/SortExternal.cfh
+++ b/core/Lucy/Util/SortExternal.cfh
@@ -46,7 +46,7 @@ __END_C__
* SortExternal object then interleaves multiple sorted streams to produce a
* single unified stream of sorted values.
*/
-abstract class Lucy::Util::SortExternal cnick SortEx
+abstract class Lucy::Util::SortExternal nickname SortEx
inherits Clownfish::Obj {
uint8_t *cache;
http://git-wip-us.apache.org/repos/asf/lucy/blob/c3a9a7cc/devel/conf/clownfish.vim
----------------------------------------------------------------------
diff --git a/devel/conf/clownfish.vim b/devel/conf/clownfish.vim
index 9cff03b..bfe37f3 100644
--- a/devel/conf/clownfish.vim
+++ b/devel/conf/clownfish.vim
@@ -32,7 +32,7 @@ syn keyword cfishType void
syn keyword cfishType class
syn keyword cfishType parcel
-syn keyword cfishAttribute inherits cnick
+syn keyword cfishAttribute inherits nickname
syn keyword cfishModifier public private
syn keyword cfishModifier abstract inert const final
[lucy-commits] [2/3] git commit: refs/heads/master - Remove Clownfish files from
rat-excludes
Posted by nw...@apache.org.
Remove Clownfish files from rat-excludes
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/920dca8b
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/920dca8b
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/920dca8b
Branch: refs/heads/master
Commit: 920dca8b4129d91790b9fb481cff7bdf7b10d0ca
Parents: c3a9a7c
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Apr 23 16:38:51 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Apr 23 16:38:51 2014 +0200
----------------------------------------------------------------------
devel/conf/rat-excludes | 23 -----------------------
1 file changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/920dca8b/devel/conf/rat-excludes
----------------------------------------------------------------------
diff --git a/devel/conf/rat-excludes b/devel/conf/rat-excludes
index 209311e..676f566 100644
--- a/devel/conf/rat-excludes
+++ b/devel/conf/rat-excludes
@@ -18,18 +18,11 @@
# CHANGES and MANIFEST files do not require license headers.
CHANGES
-clownfish/compiler/perl/MANIFEST
-clownfish/runtime/perl/MANIFEST
perl/MANIFEST
# doc file does not require license.
CONTRIBUTING
-# These files are autogenerated by running CFCLexHeader.l through Flex.
-# Flex's licensing explicitly disclaims copyright on generated lexers.
-clownfish/compiler/src/CFCLexHeader.h
-clownfish/compiler/src/CFCLexHeader.c
-
# The Lemon parser generator is in the public domain. See LUCY-173.
lemon/lemon.c
lemon/lempar.c
@@ -76,27 +69,11 @@ perl/sample/us_constitution/*.txt
# Clownfish parcel files (.cfp) are in JSON format and cannot have comments.
core/Lucy.cfp
core/TestLucy.cfp
-clownfish/compiler/c/t/cfbase/Animal.cfp
-clownfish/compiler/c/t/cfext/AnimalExtension.cfp
-clownfish/compiler/perl/t/cfbase/Animal.cfp
-clownfish/compiler/perl/t/cfclash/bar/Bar.cfp
-clownfish/compiler/perl/t/cfclash/class/AnimalExtension.cfp
-clownfish/compiler/perl/t/cfclash/foo/Foo.cfp
-clownfish/compiler/perl/t/cfext/AnimalExtension.cfp
-clownfish/runtime/core/Clownfish.cfp
-clownfish/runtime/core/TestClownfish.cfp
# gitignore files should be ignored
.gitignore
c/.gitignore
charmonizer/.gitignore
-clownfish/.gitignore
-clownfish/compiler/.gitignore
-clownfish/compiler/c/.gitignore
-clownfish/compiler/perl/.gitignore
-clownfish/devel/benchmarks/method_dispatch/.gitignore
-clownfish/runtime/c/.gitignore
-clownfish/runtime/perl/.gitignore
core/Lucy/Util/Json/.gitignore
lemon/.gitignore
perl/.gitignore
[lucy-commits] [3/3] git commit: refs/heads/master - Adjust regen_charmonizer.pl
after Clownfish removal
Posted by nw...@apache.org.
Adjust regen_charmonizer.pl after Clownfish removal
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/d4282a9a
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d4282a9a
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d4282a9a
Branch: refs/heads/master
Commit: d4282a9a244444127cebd481a309603425cf59cb
Parents: 920dca8
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Wed Apr 23 16:40:52 2014 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Wed Apr 23 16:40:52 2014 +0200
----------------------------------------------------------------------
devel/bin/regen_charmonizer.pl | 31 +++++--------------------------
1 file changed, 5 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/d4282a9a/devel/bin/regen_charmonizer.pl
----------------------------------------------------------------------
diff --git a/devel/bin/regen_charmonizer.pl b/devel/bin/regen_charmonizer.pl
index 53e4f2a..916c85a 100755
--- a/devel/bin/regen_charmonizer.pl
+++ b/devel/bin/regen_charmonizer.pl
@@ -38,30 +38,9 @@ my $MELD_EXE = catfile( $CHAZ_DIR, 'buildbin', 'meld.pl' );
die("Couldn't find meld.pl at $MELD_EXE")
if !-e $MELD_EXE;
-# Clownfish compiler.
-{
- my $main = catfile(qw( clownfish compiler common charmonizer.main ));
- my $out = $main;
- $out =~ s/\.main/.c/ or die "no match";
- unlink $out;
- system( $MELD_EXE, "--probes=", "--files=$main", "--out=$out" );
-}
-
-# Clownfish runtime.
-{
- my $main = catfile(qw( clownfish runtime common charmonizer.main ));
- my $out = $main;
- $out =~ s/\.main/.c/ or die "no match";
- unlink $out;
- system( $MELD_EXE, '--probes=', "--files=$main", "--out=$out" );
-}
-
-# Lucy core.
-{
- my $main = catfile(qw( common charmonizer.main ));
- my $out = $main;
- $out =~ s/\.main/.c/ or die "no match";
- unlink $out;
- system( $MELD_EXE, '--probes=', "--files=$main", "--out=$out" );
-}
+my $main = catfile(qw( common charmonizer.main ));
+my $out = $main;
+$out =~ s/\.main/.c/ or die "no match";
+unlink $out;
+system( $MELD_EXE, '--probes=', "--files=$main", "--out=$out" );