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 2013/05/11 17:29:47 UTC
[lucy-commits] [1/2] git commit: refs/heads/clownfish-public - Make some
constructors public
Updated Branches:
refs/heads/clownfish-public [created] 769d2f305
Make some constructors public
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/769d2f30
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/769d2f30
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/769d2f30
Branch: refs/heads/clownfish-public
Commit: 769d2f305efdefab430d12d18ac63c2666a6fa9d
Parents: 7e7545e
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 11 14:16:56 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 11 17:28:47 2013 +0200
----------------------------------------------------------------------
core/Lucy/Analysis/CaseFolder.cfh | 2 +-
core/Lucy/Analysis/EasyAnalyzer.cfh | 2 +-
core/Lucy/Analysis/Normalizer.cfh | 2 +-
core/Lucy/Analysis/PolyAnalyzer.cfh | 2 +-
core/Lucy/Analysis/RegexTokenizer.cfh | 2 +-
core/Lucy/Analysis/SnowballStemmer.cfh | 2 +-
core/Lucy/Analysis/SnowballStopFilter.cfh | 2 +-
core/Lucy/Analysis/StandardTokenizer.cfh | 2 +-
core/Lucy/Document/Doc.cfh | 2 +-
core/Lucy/Highlight/Highlighter.cfh | 2 +-
core/Lucy/Object/BitVector.cfh | 2 +-
core/Lucy/Search/ANDQuery.cfh | 2 +-
core/Lucy/Search/IndexSearcher.cfh | 2 +-
core/Lucy/Search/LeafQuery.cfh | 2 +-
core/Lucy/Search/MatchAllQuery.cfh | 2 +-
core/Lucy/Search/NOTQuery.cfh | 2 +-
core/Lucy/Search/NoMatchQuery.cfh | 2 +-
core/Lucy/Search/ORQuery.cfh | 2 +-
core/Lucy/Search/PhraseQuery.cfh | 2 +-
core/Lucy/Search/PolySearcher.cfh | 2 +-
core/Lucy/Search/QueryParser.cfh | 2 +-
core/Lucy/Search/RangeQuery.cfh | 2 +-
core/Lucy/Search/RequiredOptionalQuery.cfh | 2 +-
core/Lucy/Search/Span.cfh | 2 +-
core/Lucy/Search/TermQuery.cfh | 2 +-
core/Lucy/Store/FSFolder.cfh | 2 +-
core/Lucy/Store/LockFactory.cfh | 2 +-
core/Lucy/Store/RAMFolder.cfh | 2 +-
core/LucyX/Search/ProximityQuery.cfh | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/CaseFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/CaseFolder.cfh b/core/Lucy/Analysis/CaseFolder.cfh
index 137905d..b55c74e 100644
--- a/core/Lucy/Analysis/CaseFolder.cfh
+++ b/core/Lucy/Analysis/CaseFolder.cfh
@@ -30,7 +30,7 @@ public class Lucy::Analysis::CaseFolder
Normalizer *normalizer;
- inert incremented CaseFolder*
+ public inert incremented CaseFolder*
new();
/** Constructor. Takes no arguments.
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/EasyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/EasyAnalyzer.cfh b/core/Lucy/Analysis/EasyAnalyzer.cfh
index 495ec0d..eb0cb07 100644
--- a/core/Lucy/Analysis/EasyAnalyzer.cfh
+++ b/core/Lucy/Analysis/EasyAnalyzer.cfh
@@ -49,7 +49,7 @@ public class Lucy::Analysis::EasyAnalyzer
Normalizer *normalizer;
SnowballStemmer *stemmer;
- inert incremented EasyAnalyzer*
+ public inert incremented EasyAnalyzer*
new(const CharBuf *language = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/Normalizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.cfh b/core/Lucy/Analysis/Normalizer.cfh
index da1882b..880ae51 100644
--- a/core/Lucy/Analysis/Normalizer.cfh
+++ b/core/Lucy/Analysis/Normalizer.cfh
@@ -32,7 +32,7 @@ public class Lucy::Analysis::Normalizer
int options;
- inert incremented Normalizer*
+ public inert incremented Normalizer*
new(const CharBuf *normalization_form = NULL, bool case_fold = true,
bool strip_accents = false);
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/PolyAnalyzer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/PolyAnalyzer.cfh b/core/Lucy/Analysis/PolyAnalyzer.cfh
index a7cdd93..98d074f 100644
--- a/core/Lucy/Analysis/PolyAnalyzer.cfh
+++ b/core/Lucy/Analysis/PolyAnalyzer.cfh
@@ -52,7 +52,7 @@ public class Lucy::Analysis::PolyAnalyzer
VArray *analyzers;
- inert incremented PolyAnalyzer*
+ public inert incremented PolyAnalyzer*
new(const CharBuf *language = NULL, VArray *analyzers = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/RegexTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/RegexTokenizer.cfh b/core/Lucy/Analysis/RegexTokenizer.cfh
index 72c7097..daf457b 100644
--- a/core/Lucy/Analysis/RegexTokenizer.cfh
+++ b/core/Lucy/Analysis/RegexTokenizer.cfh
@@ -59,7 +59,7 @@ public class Lucy::Analysis::RegexTokenizer
inert bool
is_available();
- inert incremented RegexTokenizer*
+ public inert incremented RegexTokenizer*
new(const CharBuf *pattern = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/SnowballStemmer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStemmer.cfh b/core/Lucy/Analysis/SnowballStemmer.cfh
index 3419eb2..b8a04b4 100644
--- a/core/Lucy/Analysis/SnowballStemmer.cfh
+++ b/core/Lucy/Analysis/SnowballStemmer.cfh
@@ -31,7 +31,7 @@ public class Lucy::Analysis::SnowballStemmer cnick SnowStemmer
void *snowstemmer;
CharBuf *language;
- inert incremented SnowballStemmer*
+ public inert incremented SnowballStemmer*
new(const CharBuf *language);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/SnowballStopFilter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.cfh b/core/Lucy/Analysis/SnowballStopFilter.cfh
index 3303a96..8bbb514 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.cfh
+++ b/core/Lucy/Analysis/SnowballStopFilter.cfh
@@ -73,7 +73,7 @@ public class Lucy::Analysis::SnowballStopFilter cnick SnowStop
inert const uint8_t** snow_ru;
inert const uint8_t** snow_sv;
- inert incremented SnowballStopFilter*
+ public inert incremented SnowballStopFilter*
new(const CharBuf *language = NULL, Hash *stoplist = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Analysis/StandardTokenizer.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/StandardTokenizer.cfh b/core/Lucy/Analysis/StandardTokenizer.cfh
index 04af965..51efa33 100644
--- a/core/Lucy/Analysis/StandardTokenizer.cfh
+++ b/core/Lucy/Analysis/StandardTokenizer.cfh
@@ -29,7 +29,7 @@ parcel Lucy;
public class Lucy::Analysis::StandardTokenizer
inherits Lucy::Analysis::Analyzer {
- inert incremented StandardTokenizer*
+ public inert incremented StandardTokenizer*
new();
/** Constructor. Takes no arguments.
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Document/Doc.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Document/Doc.cfh b/core/Lucy/Document/Doc.cfh
index 60c906d..3c4d572 100644
--- a/core/Lucy/Document/Doc.cfh
+++ b/core/Lucy/Document/Doc.cfh
@@ -28,7 +28,7 @@ public class Lucy::Document::Doc inherits Clownfish::Obj
void *fields;
int32_t doc_id;
- inert incremented Doc*
+ public inert incremented Doc*
new(void *fields = NULL, int32_t doc_id = 0);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Highlight/Highlighter.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.cfh b/core/Lucy/Highlight/Highlighter.cfh
index c4eaad0..7f4d5f3 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 {
CharBuf *post_tag;
Compiler *compiler;
- inert incremented Highlighter*
+ public inert incremented Highlighter*
new(Searcher *searcher, Obj *query, const CharBuf *field,
uint32_t excerpt_length = 200);
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Object/BitVector.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Object/BitVector.cfh b/core/Lucy/Object/BitVector.cfh
index e0ade93..6dbe417 100644
--- a/core/Lucy/Object/BitVector.cfh
+++ b/core/Lucy/Object/BitVector.cfh
@@ -27,7 +27,7 @@ public class Lucy::Object::BitVector cnick BitVec
uint32_t cap;
uint8_t *bits;
- inert incremented BitVector*
+ public inert incremented BitVector*
new(uint32_t capacity = 0);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/ANDQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/ANDQuery.cfh b/core/Lucy/Search/ANDQuery.cfh
index e7d2bb3..8b9559c 100644
--- a/core/Lucy/Search/ANDQuery.cfh
+++ b/core/Lucy/Search/ANDQuery.cfh
@@ -25,7 +25,7 @@ parcel Lucy;
public class Lucy::Search::ANDQuery inherits Lucy::Search::PolyQuery
: dumpable {
- inert incremented ANDQuery*
+ public inert incremented ANDQuery*
new(VArray *children = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/IndexSearcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/IndexSearcher.cfh b/core/Lucy/Search/IndexSearcher.cfh
index b5381c6..e5b8afa 100644
--- a/core/Lucy/Search/IndexSearcher.cfh
+++ b/core/Lucy/Search/IndexSearcher.cfh
@@ -35,7 +35,7 @@ public class Lucy::Search::IndexSearcher cnick IxSearcher
VArray *seg_readers;
I32Array *seg_starts;
- inert incremented IndexSearcher*
+ public inert incremented IndexSearcher*
new(Obj *index);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/LeafQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/LeafQuery.cfh b/core/Lucy/Search/LeafQuery.cfh
index d6c7bb6..f5e80c4 100644
--- a/core/Lucy/Search/LeafQuery.cfh
+++ b/core/Lucy/Search/LeafQuery.cfh
@@ -31,7 +31,7 @@ public class Lucy::Search::LeafQuery inherits Lucy::Search::Query
CharBuf *field;
CharBuf *text;
- inert incremented LeafQuery*
+ public inert incremented LeafQuery*
new(const CharBuf *field = NULL, const CharBuf *text);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/MatchAllQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/MatchAllQuery.cfh b/core/Lucy/Search/MatchAllQuery.cfh
index 19e32c8..b2dd843 100644
--- a/core/Lucy/Search/MatchAllQuery.cfh
+++ b/core/Lucy/Search/MatchAllQuery.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
public abstract class Lucy::Search::MatchAllQuery
inherits Lucy::Search::Query : dumpable {
- inert incremented MatchAllQuery*
+ public inert incremented MatchAllQuery*
new();
/** Constructor. Takes no arguments.
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/NOTQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/NOTQuery.cfh b/core/Lucy/Search/NOTQuery.cfh
index 874dbb8..944a611 100644
--- a/core/Lucy/Search/NOTQuery.cfh
+++ b/core/Lucy/Search/NOTQuery.cfh
@@ -33,7 +33,7 @@ public class Lucy::Search::NOTQuery inherits Lucy::Search::PolyQuery
/**
* @param negated_query The Query to be inverted.
*/
- inert incremented NOTQuery*
+ public inert incremented NOTQuery*
new(Query *negated_query);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/NoMatchQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/NoMatchQuery.cfh b/core/Lucy/Search/NoMatchQuery.cfh
index 461274f..cb72349 100644
--- a/core/Lucy/Search/NoMatchQuery.cfh
+++ b/core/Lucy/Search/NoMatchQuery.cfh
@@ -28,7 +28,7 @@ public class Lucy::Search::NoMatchQuery inherits Lucy::Search::Query
bool fails_to_match;
- inert incremented NoMatchQuery*
+ public inert incremented NoMatchQuery*
new();
/** Constructor. Takes no arguments.
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/ORQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/ORQuery.cfh b/core/Lucy/Search/ORQuery.cfh
index c7bcdd9..b39aece 100644
--- a/core/Lucy/Search/ORQuery.cfh
+++ b/core/Lucy/Search/ORQuery.cfh
@@ -27,7 +27,7 @@ parcel Lucy;
public class Lucy::Search::ORQuery inherits Lucy::Search::PolyQuery
: dumpable {
- inert incremented ORQuery*
+ public inert incremented ORQuery*
new(VArray *children = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/PhraseQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PhraseQuery.cfh b/core/Lucy/Search/PhraseQuery.cfh
index 6991430..fab8a1b 100644
--- a/core/Lucy/Search/PhraseQuery.cfh
+++ b/core/Lucy/Search/PhraseQuery.cfh
@@ -28,7 +28,7 @@ public class Lucy::Search::PhraseQuery inherits Lucy::Search::Query
CharBuf *field;
VArray *terms;
- inert incremented PhraseQuery*
+ public inert incremented PhraseQuery*
new(const CharBuf *field, VArray *terms);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/PolySearcher.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/PolySearcher.cfh b/core/Lucy/Search/PolySearcher.cfh
index 73d8dfd..956f41b 100644
--- a/core/Lucy/Search/PolySearcher.cfh
+++ b/core/Lucy/Search/PolySearcher.cfh
@@ -29,7 +29,7 @@ public class Lucy::Search::PolySearcher
I32Array *starts;
int32_t doc_max;
- inert incremented PolySearcher*
+ public inert incremented PolySearcher*
new(Schema *schema, VArray *searchers);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/QueryParser.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.cfh b/core/Lucy/Search/QueryParser.cfh
index f98caa7..d57486a 100644
--- a/core/Lucy/Search/QueryParser.cfh
+++ b/core/Lucy/Search/QueryParser.cfh
@@ -51,7 +51,7 @@ public class Lucy::Search::QueryParser cnick QParser
bool heed_colons;
int32_t default_occur;
- inert incremented QueryParser*
+ public inert incremented QueryParser*
new(Schema *schema, Analyzer *analyzer = NULL,
const CharBuf *default_boolop = NULL, VArray *fields = NULL);
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/RangeQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RangeQuery.cfh b/core/Lucy/Search/RangeQuery.cfh
index 1ad4ff4..0af06ed 100644
--- a/core/Lucy/Search/RangeQuery.cfh
+++ b/core/Lucy/Search/RangeQuery.cfh
@@ -31,7 +31,7 @@ public class Lucy::Search::RangeQuery inherits Lucy::Search::Query
bool include_lower;
bool include_upper;
- inert incremented RangeQuery*
+ public inert incremented RangeQuery*
new(const CharBuf *field, Obj *lower_term = NULL, Obj *upper_term = NULL,
bool include_lower = true, bool include_upper = true);
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/RequiredOptionalQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RequiredOptionalQuery.cfh b/core/Lucy/Search/RequiredOptionalQuery.cfh
index 92dcab9..34cc490 100644
--- a/core/Lucy/Search/RequiredOptionalQuery.cfh
+++ b/core/Lucy/Search/RequiredOptionalQuery.cfh
@@ -26,7 +26,7 @@ parcel Lucy;
public class Lucy::Search::RequiredOptionalQuery cnick ReqOptQuery
inherits Lucy::Search::PolyQuery {
- inert incremented RequiredOptionalQuery*
+ public inert incremented RequiredOptionalQuery*
new(Query *required_query, Query *optional_query);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/Span.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/Span.cfh b/core/Lucy/Search/Span.cfh
index e9d60df..e099fb3 100644
--- a/core/Lucy/Search/Span.cfh
+++ b/core/Lucy/Search/Span.cfh
@@ -32,7 +32,7 @@ public class Lucy::Search::Span inherits Clownfish::Obj {
int32_t length;
float weight;
- inert incremented Span*
+ public inert incremented Span*
new(int32_t offset, int32_t length, float weight = 0.0);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Search/TermQuery.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/TermQuery.cfh b/core/Lucy/Search/TermQuery.cfh
index 70b01a6..af1800b 100644
--- a/core/Lucy/Search/TermQuery.cfh
+++ b/core/Lucy/Search/TermQuery.cfh
@@ -29,7 +29,7 @@ public class Lucy::Search::TermQuery inherits Lucy::Search::Query
CharBuf *field;
Obj *term;
- inert incremented TermQuery*
+ public inert incremented TermQuery*
new(const CharBuf *field, const Obj *term);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Store/FSFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/FSFolder.cfh b/core/Lucy/Store/FSFolder.cfh
index 193db23..4674c02 100644
--- a/core/Lucy/Store/FSFolder.cfh
+++ b/core/Lucy/Store/FSFolder.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
public class Lucy::Store::FSFolder inherits Lucy::Store::Folder {
- inert incremented FSFolder*
+ public inert incremented FSFolder*
new(const CharBuf *path);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Store/LockFactory.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/LockFactory.cfh b/core/Lucy/Store/LockFactory.cfh
index 29d661e..2eecca5 100644
--- a/core/Lucy/Store/LockFactory.cfh
+++ b/core/Lucy/Store/LockFactory.cfh
@@ -30,7 +30,7 @@ public class Lucy::Store::LockFactory cnick LockFact
Folder *folder;
CharBuf *host;
- inert incremented LockFactory*
+ public inert incremented LockFactory*
new(Folder *folder, const CharBuf *host);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/Lucy/Store/RAMFolder.cfh
----------------------------------------------------------------------
diff --git a/core/Lucy/Store/RAMFolder.cfh b/core/Lucy/Store/RAMFolder.cfh
index 6472449..c83484f 100644
--- a/core/Lucy/Store/RAMFolder.cfh
+++ b/core/Lucy/Store/RAMFolder.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
public class Lucy::Store::RAMFolder inherits Lucy::Store::Folder {
- inert incremented RAMFolder*
+ public inert incremented RAMFolder*
new(const CharBuf *path = NULL);
/**
http://git-wip-us.apache.org/repos/asf/lucy/blob/769d2f30/core/LucyX/Search/ProximityQuery.cfh
----------------------------------------------------------------------
diff --git a/core/LucyX/Search/ProximityQuery.cfh b/core/LucyX/Search/ProximityQuery.cfh
index 2506961..c90f713 100644
--- a/core/LucyX/Search/ProximityQuery.cfh
+++ b/core/LucyX/Search/ProximityQuery.cfh
@@ -29,7 +29,7 @@ public class LucyX::Search::ProximityQuery inherits Lucy::Search::Query
VArray *terms;
uint32_t within;
- inert incremented ProximityQuery*
+ public inert incremented ProximityQuery*
new(const CharBuf *field, VArray *terms, uint32_t within);
/**
[lucy-commits] [2/2] git commit: refs/heads/clownfish-public - Make some Clownfish
classes and methods public
Posted by nw...@apache.org.
Make some Clownfish classes and methods public
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/7e7545ef
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/7e7545ef
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/7e7545ef
Branch: refs/heads/clownfish-public
Commit: 7e7545efd64148e9799362671974fb4b16d8f9d9
Parents: bec7902
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 11 13:54:38 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 11 17:28:47 2013 +0200
----------------------------------------------------------------------
core/Clownfish/CharBuf.cfh | 88 +++++++++++++++++++-------------------
core/Clownfish/Err.cfh | 2 +-
core/Clownfish/Hash.cfh | 28 ++++++------
core/Clownfish/Num.cfh | 38 ++++++++--------
core/Clownfish/VArray.cfh | 34 +++++++-------
core/Clownfish/VTable.cfh | 8 ++--
6 files changed, 99 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/CharBuf.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/CharBuf.cfh b/core/Clownfish/CharBuf.cfh
index f9d9ab5..87ca739 100644
--- a/core/Clownfish/CharBuf.cfh
+++ b/core/Clownfish/CharBuf.cfh
@@ -20,14 +20,14 @@ parcel Lucy;
* Growable buffer holding Unicode characters.
*/
-class Clownfish::CharBuf cnick CB
+public class Clownfish::CharBuf cnick CB
inherits Clownfish::Obj {
char *ptr;
size_t size;
size_t cap; /* allocated bytes, including terminating null */
- inert incremented CharBuf*
+ public inert incremented CharBuf*
new(size_t size);
inert CharBuf*
@@ -36,13 +36,13 @@ class Clownfish::CharBuf cnick CB
/** Return a new CharBuf which holds a copy of the passed-in string.
* Check for UTF-8 validity.
*/
- inert incremented CharBuf*
+ public inert incremented CharBuf*
new_from_utf8(const char *utf8, size_t size);
/** Return a new CharBuf which holds a copy of the passed-in string. No
* validity checking is performed.
*/
- inert incremented CharBuf*
+ public inert incremented CharBuf*
new_from_trusted_utf8(const char *utf8, size_t size);
/** Return a pointer to a new CharBuf which assumes ownership of the
@@ -63,7 +63,7 @@ class Clownfish::CharBuf cnick CB
* Note: a user-supplied <code>pattern</code> string is a security hole
* and must not be allowed.
*/
- inert incremented CharBuf*
+ public inert incremented CharBuf*
newf(const char *pattern, ...);
/** Perform lexical comparison of two CharBufs, with level of indirection
@@ -82,18 +82,18 @@ class Clownfish::CharBuf cnick CB
public void
Mimic(CharBuf *self, Obj *other);
- void
+ public void
Mimic_Str(CharBuf *self, const char *ptr, size_t size);
/** Concatenate the passed-in string onto the end of the CharBuf.
*/
- void
+ public void
Cat_Str(CharBuf *self, const char *ptr, size_t size);
/** Concatenate the contents of <code>other</code> onto the end of the
* caller.
*/
- void
+ public void
Cat(CharBuf *self, const CharBuf *other);
/** Concatenate formatted arguments. Similar to the printf family, but
@@ -108,23 +108,23 @@ class Clownfish::CharBuf cnick CB
* Note that all Clownfish Objects, including CharBufs, are printed via
* %o (which invokes Obj_To_String()).
*/
- void
+ public void
VCatF(CharBuf *self, const char *pattern, va_list args);
/** Invokes CB_VCatF to concatenate formatted arguments. Note that this
* is only a function and not a method.
*/
- inert void
+ public inert void
catf(CharBuf *self, const char *pattern, ...);
/** Replaces the contents of the CharBuf using formatted arguments.
*/
- inert void
+ public inert void
setf(CharBuf *self, const char *pattern, ...);
/** Concatenate one Unicode character onto the end of the CharBuf.
*/
- void
+ public void
Cat_Char(CharBuf *self, uint32_t code_point);
/** Replace all instances of one character for the other. For now, both
@@ -138,7 +138,7 @@ class Clownfish::CharBuf cnick CB
/** Extract a 64-bit integer from a variable-base stringified version.
*/
- int64_t
+ public int64_t
BaseX_To_I64(CharBuf *self, uint32_t base);
public double
@@ -150,46 +150,46 @@ class Clownfish::CharBuf cnick CB
*
* @return a pointer to the raw buffer.
*/
- char*
+ public char*
Grow(CharBuf *self, size_t size);
/** Test whether the CharBuf starts with the content of another.
*/
- bool
+ public bool
Starts_With(CharBuf *self, const CharBuf *prefix);
/** Test whether the CharBuf starts with the passed-in string.
*/
- bool
+ public bool
Starts_With_Str(CharBuf *self, const char *prefix, size_t size);
/** Test whether the CharBuf ends with the content of another.
*/
- bool
+ public bool
Ends_With(CharBuf *self, const CharBuf *postfix);
/** Test whether the CharBuf ends with the passed-in string.
*/
- bool
+ public bool
Ends_With_Str(CharBuf *self, const char *postfix, size_t size);
/** Return the location of the substring within the CharBuf (measured in
* code points), or -1 if the substring does not match.
*/
- int64_t
+ public int64_t
Find(CharBuf *self, const CharBuf *substring);
- int64_t
+ public int64_t
Find_Str(CharBuf *self, const char *ptr, size_t size);
/** Test whether the CharBuf matches the passed-in string.
*/
- bool
+ public bool
Equals_Str(CharBuf *self, const char *ptr, size_t size);
/** Return the number of Unicode code points in the object's string.
*/
- size_t
+ public size_t
Length(CharBuf *self);
/** Set the CharBuf's <code>size</code> attribute.
@@ -199,7 +199,7 @@ class Clownfish::CharBuf cnick CB
/** Get the CharBuf's <code>size</code> attribute.
*/
- size_t
+ public size_t
Get_Size(CharBuf *self);
/** Return the internal backing array for the CharBuf if its internal
@@ -243,35 +243,35 @@ class Clownfish::CharBuf cnick CB
/** Remove Unicode whitespace characters from both top and tail.
*/
- uint32_t
+ public uint32_t
Trim(CharBuf *self);
/** Remove leading Unicode whitespace.
*/
- uint32_t
+ public uint32_t
Trim_Top(CharBuf *self);
/** Remove trailing Unicode whitespace.
*/
- uint32_t
+ public uint32_t
Trim_Tail(CharBuf *self);
/** Remove characters (measured in code points) from the top of the
* CharBuf. Returns the number nipped.
*/
- size_t
+ public size_t
Nip(CharBuf *self, size_t count);
/** Remove one character from the top of the CharBuf. Returns the code
* point, or 0 if the string was empty.
*/
- int32_t
+ public int32_t
Nip_One(CharBuf *self);
/** Remove characters (measured in code points) from the end of the
* CharBuf. Returns the number chopped.
*/
- size_t
+ public size_t
Chop(CharBuf *self, size_t count);
/** Truncate the CharBuf so that it contains no more than
@@ -280,7 +280,7 @@ class Clownfish::CharBuf cnick CB
* @param count Maximum new length, in Unicode code points.
* @return The number of code points left in the string after truncation.
*/
- size_t
+ public size_t
Truncate(CharBuf *self, size_t count);
/** Return the Unicode code point at the specified number of code points
@@ -288,14 +288,14 @@ class Clownfish::CharBuf cnick CB
* better to throw an exception, but that's not practical with UTF-8 and
* no cached length.)
*/
- uint32_t
+ public uint32_t
Code_Point_At(CharBuf *self, size_t tick);
/** Return the Unicode code point at the specified number of code points
* counted backwards from the end of the string. Return 0 if outside the
* string.
*/
- uint32_t
+ public uint32_t
Code_Point_From(CharBuf *self, size_t tick);
/** Return a newly allocated CharBuf containing a copy of the indicated
@@ -303,48 +303,48 @@ class Clownfish::CharBuf cnick CB
* @param offset Offset from the top, in code points.
* @param len The desired length of the substring, in code points.
*/
- incremented CharBuf*
+ public incremented CharBuf*
SubString(CharBuf *self, size_t offset, size_t len);
/** Concatenate the supplied text onto the end of the CharBuf. Don't
* check for UTF-8 validity.
*/
- void
+ public void
Cat_Trusted_Str(CharBuf *self, const char *ptr, size_t size);
}
-class Clownfish::ViewCharBuf cnick ViewCB
+public class Clownfish::ViewCharBuf cnick ViewCB
inherits Clownfish::CharBuf {
- inert incremented ViewCharBuf*
+ public inert incremented ViewCharBuf*
new_from_utf8(const char *utf8, size_t size);
- inert incremented ViewCharBuf*
+ public inert incremented ViewCharBuf*
new_from_trusted_utf8(const char *utf8, size_t size);
inert ViewCharBuf*
init(ViewCharBuf *self, const char *utf8, size_t size);
- void
+ public void
Assign(ViewCharBuf *self, const CharBuf *other);
- void
+ public void
Assign_Str(ViewCharBuf *self, const char *utf8, size_t size);
- void
+ public void
Assign_Trusted_Str(ViewCharBuf *self, const char *utf8, size_t size);
- uint32_t
+ public uint32_t
Trim_Top(ViewCharBuf *self);
- size_t
+ public size_t
Nip(ViewCharBuf *self, size_t count);
- int32_t
+ public int32_t
Nip_One(ViewCharBuf *self);
/** Throws an error. */
- char*
+ public char*
Grow(ViewCharBuf *self, size_t size);
public void
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/Err.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Err.cfh b/core/Clownfish/Err.cfh
index 558c710..55ef8be 100644
--- a/core/Clownfish/Err.cfh
+++ b/core/Clownfish/Err.cfh
@@ -44,7 +44,7 @@ public class Clownfish::Err inherits Clownfish::Obj {
inert void
init_class();
- inert incremented Err*
+ public inert incremented Err*
new(decremented CharBuf *mess);
inert Err*
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/Hash.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Hash.cfh b/core/Clownfish/Hash.cfh
index 787184f..5c17c43 100644
--- a/core/Clownfish/Hash.cfh
+++ b/core/Clownfish/Hash.cfh
@@ -24,7 +24,7 @@ parcel Lucy;
* this behavior can be changed by overridding Make_Key(), e.g. to implement
* efficient hash sets.
*/
-class Clownfish::Hash inherits Clownfish::Obj {
+public class Clownfish::Hash inherits Clownfish::Obj {
void *entries;
uint32_t capacity;
@@ -35,7 +35,7 @@ class Clownfish::Hash inherits Clownfish::Obj {
inert void
init_class();
- inert incremented Hash*
+ public inert incremented Hash*
new(uint32_t capacity = 0);
/**
@@ -47,16 +47,16 @@ class Clownfish::Hash inherits Clownfish::Obj {
/** Empty the hash of all key-value pairs.
*/
- void
+ public void
Clear(Hash *self);
/** Store a key-value pair. If <code>key</code> is not already present,
* Make_Key() will be called to manufacture the internally used key.
*/
- void
+ public void
Store(Hash *self, Obj *key, decremented Obj *value);
- void
+ public void
Store_Str(Hash *self, const char *str, size_t len,
decremented Obj *value);
@@ -64,10 +64,10 @@ class Clownfish::Hash inherits Clownfish::Obj {
*
* @return the value, or NULL if <code>key</code> is not present.
*/
- nullable Obj*
+ public nullable Obj*
Fetch(Hash *self, const Obj *key);
- nullable Obj*
+ public nullable Obj*
Fetch_Str(Hash *self, const char *key, size_t key_len);
/** Attempt to delete a key-value pair from the hash.
@@ -75,17 +75,17 @@ class Clownfish::Hash inherits Clownfish::Obj {
* @return the value if <code>key</code> exists and thus deletion
* succeeds; otherwise NULL.
*/
- incremented nullable Obj*
+ public incremented nullable Obj*
Delete(Hash *self, const Obj *key);
- incremented nullable Obj*
+ public incremented nullable Obj*
Delete_Str(Hash *self, const char *key, size_t key_ley);
/** Prepare to iterate over all the key-value pairs in the hash.
*
* @return the number of pairs which will be iterated over.
*/
- uint32_t
+ public uint32_t
Iterate(Hash *self);
/** Retrieve the next key-value pair from the hash, setting the supplied
@@ -94,23 +94,23 @@ class Clownfish::Hash inherits Clownfish::Obj {
* @return true while iterating, false when the iterator has been
* exhausted.
*/
- bool
+ public bool
Next(Hash *self, Obj **key, Obj **value);
/** Search for a key which Equals the key supplied, and return the key
* rather than its value.
*/
- nullable Obj*
+ public nullable Obj*
Find_Key(Hash *self, const Obj *key, int32_t hash_sum);
/** Return an VArray of pointers to the hash's keys.
*/
- incremented VArray*
+ public incremented VArray*
Keys(Hash *self);
/** Return an VArray of pointers to the hash's values.
*/
- incremented VArray*
+ public incremented VArray*
Values(Hash *self);
/** Create a key to be stored within the hash entry. Implementations must
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/Num.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/Num.cfh b/core/Clownfish/Num.cfh
index 0ff37be..c2f9c93 100644
--- a/core/Clownfish/Num.cfh
+++ b/core/Clownfish/Num.cfh
@@ -58,7 +58,7 @@ abstract class Clownfish::IntNum inherits Clownfish::Num {
/** Single precision floating point number.
*/
-class Clownfish::Float32 inherits Clownfish::FloatNum {
+public class Clownfish::Float32 inherits Clownfish::FloatNum {
float value;
@@ -68,13 +68,13 @@ class Clownfish::Float32 inherits Clownfish::FloatNum {
inert Float32*
init(Float32* self, float value);
- inert Float32*
+ public inert Float32*
new(float value);
- void
+ public void
Set_Value(Float32 *self, float value);
- float
+ public float
Get_Value(Float32 *self);
public int64_t
@@ -101,7 +101,7 @@ class Clownfish::Float32 inherits Clownfish::FloatNum {
/** Double precision floating point number.
*/
-class Clownfish::Float64 inherits Clownfish::FloatNum {
+public class Clownfish::Float64 inherits Clownfish::FloatNum {
double value;
@@ -111,13 +111,13 @@ class Clownfish::Float64 inherits Clownfish::FloatNum {
inert Float64*
init(Float64* self, double value);
- inert Float64*
+ public inert Float64*
new(double value);
- void
+ public void
Set_Value(Float64 *self, double value);
- double
+ public double
Get_Value(Float64 *self);
public int64_t
@@ -144,7 +144,7 @@ class Clownfish::Float64 inherits Clownfish::FloatNum {
/** 32-bit signed integer.
*/
-class Clownfish::Integer32 cnick Int32
+public class Clownfish::Integer32 cnick Int32
inherits Clownfish::IntNum {
int32_t value;
@@ -155,13 +155,13 @@ class Clownfish::Integer32 cnick Int32
inert Integer32*
init(Integer32* self, int32_t value);
- inert Integer32*
+ public inert Integer32*
new(int32_t value);
- void
+ public void
Set_Value(Integer32 *self, int32_t value);
- int32_t
+ public int32_t
Get_Value(Integer32 *self);
public int64_t
@@ -189,7 +189,7 @@ class Clownfish::Integer32 cnick Int32
/**
* 64-bit signed integer.
*/
-class Clownfish::Integer64 cnick Int64
+public class Clownfish::Integer64 cnick Int64
inherits Clownfish::IntNum {
int64_t value;
@@ -200,13 +200,13 @@ class Clownfish::Integer64 cnick Int64
inert Integer64*
init(Integer64* self, int64_t value);
- inert Integer64*
+ public inert Integer64*
new(int64_t value);
- void
+ public void
Set_Value(Integer64 *self, int64_t value);
- int64_t
+ public int64_t
Get_Value(Integer64 *self);
public int64_t
@@ -241,7 +241,7 @@ class Clownfish::Integer64 cnick Int64
* There are only two singleton instances of this class: CFISH_TRUE and
* CFISH_FALSE.
*/
-class Clownfish::BoolNum cnick Bool inherits Clownfish::IntNum {
+public class Clownfish::BoolNum cnick Bool inherits Clownfish::IntNum {
bool value;
CharBuf *string;
@@ -254,13 +254,13 @@ class Clownfish::BoolNum cnick Bool inherits Clownfish::IntNum {
/** Return either CFISH_TRUE or CFISH_FALSE depending on the supplied
* value.
*/
- inert BoolNum*
+ public inert BoolNum*
singleton(bool value);
public void
Destroy(BoolNum *self);
- bool
+ public bool
Get_Value(BoolNum *self);
public int64_t
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/VArray.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VArray.cfh b/core/Clownfish/VArray.cfh
index e6f8741..7610add 100644
--- a/core/Clownfish/VArray.cfh
+++ b/core/Clownfish/VArray.cfh
@@ -29,13 +29,13 @@ __END_C__
/** Variable-sized array.
*/
-class Clownfish::VArray cnick VA inherits Clownfish::Obj {
+public class Clownfish::VArray cnick VA inherits Clownfish::Obj {
Obj **elems;
uint32_t size;
uint32_t cap;
- inert incremented VArray*
+ public inert incremented VArray*
new(uint32_t capacity);
/**
@@ -47,63 +47,63 @@ class Clownfish::VArray cnick VA inherits Clownfish::Obj {
/** Push an item onto the end of a VArray.
*/
- void
+ public void
Push(VArray *self, decremented Obj *element = NULL);
/** Push all the elements of another VArray onto the end of this one.
*/
- void
+ public void
Push_VArray(VArray *self, VArray *other);
/** Pop an item off of the end of a VArray.
*/
- incremented nullable Obj*
+ public incremented nullable Obj*
Pop(VArray *self);
/** Unshift an item onto the front of a VArray.
*/
- void
+ public void
Unshift(VArray *self, decremented Obj *element = NULL);
/** Shift an item off of the front of a VArray.
*/
- incremented nullable Obj*
+ public incremented nullable Obj*
Shift(VArray *self);
/** Ensure that the VArray has room for at least <code>capacity</code>
* elements.
*/
- void
+ public void
Grow(VArray *self, uint32_t capacity);
/** Fetch the element at <code>tick</tick>.
*/
- nullable Obj*
+ public nullable Obj*
Fetch(VArray *self, uint32_t tick);
/** Store an element at index <code>tick</code>, possibly displacing an
* existing element.
*/
- void
+ public void
Store(VArray *self, uint32_t tick, decremented Obj *elem = NULL);
/** Replace an element in the VArray with NULL and return it.
*
* @return whatever was stored at <code>tick</code>.
*/
- incremented nullable Obj*
+ public incremented nullable Obj*
Delete(VArray *self, uint32_t tick);
/** Remove <code>length</code> elements from the array, starting at
* <code>offset</code>. Move elements over to fill in the gap.
*/
- void
+ public void
Excise(VArray *self, uint32_t offset, uint32_t length);
/** Clone the VArray but merely increment the refcounts of its elements
* rather than clone them.
*/
- incremented VArray*
+ public incremented VArray*
Shallow_Copy(VArray *self);
/** Dupe the VArray, cloning each internal element.
@@ -118,7 +118,7 @@ class Clownfish::VArray cnick VA inherits Clownfish::Obj {
* sorts NULL elements towards the end.
* @param context Argument supplied to the comparison routine.
*/
- void
+ public void
Sort(VArray *self, Lucy_Sort_Compare_t compare = NULL,
void *context = NULL);
@@ -126,12 +126,12 @@ class Clownfish::VArray cnick VA inherits Clownfish::Obj {
* current size, grow the object to accommodate NULL elements; if smaller
* than the current size, decrement and discard truncated elements.
*/
- void
+ public void
Resize(VArray *self, uint32_t size);
/** Empty the VArray.
*/
- void
+ public void
Clear(VArray *self);
/** Accessor for <code>size</code> member.
@@ -141,7 +141,7 @@ class Clownfish::VArray cnick VA inherits Clownfish::Obj {
/** Accessor for <code>capacity</code> member.
*/
- uint32_t
+ public uint32_t
Get_Capacity(VArray *self);
/** Return all elements for which <code>test</code> returns true.
http://git-wip-us.apache.org/repos/asf/lucy/blob/7e7545ef/core/Clownfish/VTable.cfh
----------------------------------------------------------------------
diff --git a/core/Clownfish/VTable.cfh b/core/Clownfish/VTable.cfh
index 0351082..f87b191 100644
--- a/core/Clownfish/VTable.cfh
+++ b/core/Clownfish/VTable.cfh
@@ -23,7 +23,7 @@ parcel Lucy;
* behavior of VTables.)
*/
-class Clownfish::VTable inherits Clownfish::Obj {
+public class Clownfish::VTable inherits Clownfish::Obj {
VTable *parent;
CharBuf *name;
@@ -98,7 +98,7 @@ class Clownfish::VTable inherits Clownfish::Obj {
* assign its vtable and give it an initial refcount of 1. The caller is
* responsible for initialization.
*/
- Obj*
+ public Obj*
Make_Obj(VTable *self);
/** Take a raw memory allocation which is presumed to be of adequate size,
@@ -118,10 +118,10 @@ class Clownfish::VTable inherits Clownfish::Obj {
Obj*
Foster_Obj(VTable *self, void *host_obj);
- CharBuf*
+ public CharBuf*
Get_Name(VTable *self);
- VTable*
+ public VTable*
Get_Parent(VTable *self);
size_t