Repository: lucy Updated Branches: refs/heads/master fd858d715 -> c94acc5b7
Make Serialize/Deserialize methods private Project: http://git-wip-us.apache.org/repos/asf/lucy/repo Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/e4ecf75b Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/e4ecf75b Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/e4ecf75b Branch: refs/heads/master Commit: e4ecf75b1808c7d87fd738c21ac33d12fffa93d1 Parents: fd858d7 Author: Nick Wellnhofer <wellnho...@aevum.de> Authored: Thu Aug 20 21:08:11 2015 +0200 Committer: Nick Wellnhofer <wellnho...@aevum.de> Committed: Sun Aug 23 13:40:31 2015 +0200 ---------------------------------------------------------------------- core/Lucy/Document/Doc.cfh | 4 ++-- core/Lucy/Document/HitDoc.cfh | 4 ++-- core/Lucy/Index/DocVector.cfh | 4 ++-- core/Lucy/Index/Similarity.cfh | 4 ++-- core/Lucy/Index/TermVector.cfh | 8 ++++---- core/Lucy/Search/Compiler.cfh | 4 ++-- core/Lucy/Search/LeafQuery.cfh | 4 ++-- core/Lucy/Search/MatchDoc.cfh | 4 ++-- core/Lucy/Search/NoMatchQuery.cfh | 4 ++-- core/Lucy/Search/PhraseQuery.cfh | 8 ++++---- core/Lucy/Search/PolyQuery.cfh | 8 ++++---- core/Lucy/Search/Query.cfh | 4 ++-- core/Lucy/Search/RangeQuery.cfh | 4 ++-- core/Lucy/Search/SortRule.cfh | 8 ++++---- core/Lucy/Search/SortSpec.cfh | 8 ++++---- core/Lucy/Search/TermQuery.cfh | 8 ++++---- core/Lucy/Search/TopDocs.cfh | 4 ++-- core/LucyX/Search/ProximityQuery.cfh | 8 ++++---- 18 files changed, 50 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Document/Doc.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Document/Doc.cfh b/core/Lucy/Document/Doc.cfh index c1da681..c5cc855 100644 --- a/core/Lucy/Document/Doc.cfh +++ b/core/Lucy/Document/Doc.cfh @@ -86,10 +86,10 @@ public class Lucy::Document::Doc inherits Clownfish::Obj { public bool Equals(Doc *self, Obj *other); - public void + void Serialize(Doc *self, OutStream *outstream); - public incremented Doc* + incremented Doc* Deserialize(decremented Doc *self, InStream *instream); public incremented Hash* http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Document/HitDoc.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Document/HitDoc.cfh b/core/Lucy/Document/HitDoc.cfh index 9e82ae2..52ce232 100644 --- a/core/Lucy/Document/HitDoc.cfh +++ b/core/Lucy/Document/HitDoc.cfh @@ -59,10 +59,10 @@ public class Lucy::Document::HitDoc inherits Lucy::Document::Doc { public incremented HitDoc* Load(HitDoc *self, Obj *dump); - public void + void Serialize(HitDoc *self, OutStream *outstream); - public incremented HitDoc* + incremented HitDoc* Deserialize(decremented HitDoc *self, InStream *instream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Index/DocVector.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/DocVector.cfh b/core/Lucy/Index/DocVector.cfh index 8a801ad..c4ae8f7 100644 --- a/core/Lucy/Index/DocVector.cfh +++ b/core/Lucy/Index/DocVector.cfh @@ -47,10 +47,10 @@ class Lucy::Index::DocVector nickname DocVec Blob* Field_Buf(DocVector *self, String *field); - public void + void Serialize(DocVector *self, OutStream *outstream); - public incremented DocVector* + incremented DocVector* Deserialize(decremented DocVector *self, InStream *instream); public void http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Index/Similarity.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/Similarity.cfh b/core/Lucy/Index/Similarity.cfh index 39ff49e..61736df 100644 --- a/core/Lucy/Index/Similarity.cfh +++ b/core/Lucy/Index/Similarity.cfh @@ -132,10 +132,10 @@ public class Lucy::Index::Similarity nickname Sim inherits Clownfish::Obj { public bool Equals(Similarity *self, Obj *other); - public void + void Serialize(Similarity *self, OutStream *outstream); - public incremented Similarity* + incremented Similarity* Deserialize(decremented Similarity *self, InStream *instream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Index/TermVector.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Index/TermVector.cfh b/core/Lucy/Index/TermVector.cfh index 3173d42..4242008 100644 --- a/core/Lucy/Index/TermVector.cfh +++ b/core/Lucy/Index/TermVector.cfh @@ -49,7 +49,10 @@ class Lucy::Index::TermVector nickname TV I32Array* Get_End_Offsets(TermVector *self); - public incremented TermVector* + void + Serialize(TermVector *self, OutStream *outstream); + + incremented TermVector* Deserialize(decremented TermVector *self, InStream *instream); public bool @@ -57,9 +60,6 @@ class Lucy::Index::TermVector nickname TV public void Destroy(TermVector *self); - - public void - Serialize(TermVector *self, OutStream *outstream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/Compiler.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/Compiler.cfh b/core/Lucy/Search/Compiler.cfh index 34a52a1..478f8dd 100644 --- a/core/Lucy/Search/Compiler.cfh +++ b/core/Lucy/Search/Compiler.cfh @@ -151,10 +151,10 @@ public class Lucy::Search::Compiler inherits Lucy::Search::Query { Highlight_Spans(Compiler *self, Searcher *searcher, DocVector *doc_vec, String *field); - public void + void Serialize(Compiler *self, OutStream *outstream); - public incremented Compiler* + incremented Compiler* Deserialize(decremented Compiler *self, InStream *instream); public bool http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/LeafQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/LeafQuery.cfh b/core/Lucy/Search/LeafQuery.cfh index e195e7f..d9d8fa3 100644 --- a/core/Lucy/Search/LeafQuery.cfh +++ b/core/Lucy/Search/LeafQuery.cfh @@ -56,10 +56,10 @@ public class Lucy::Search::LeafQuery inherits Lucy::Search::Query { public incremented String* To_String(LeafQuery *self); - public void + void Serialize(LeafQuery *self, OutStream *outstream); - public incremented LeafQuery* + incremented LeafQuery* Deserialize(decremented LeafQuery *self, InStream *instream); public incremented Obj* http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/MatchDoc.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/MatchDoc.cfh b/core/Lucy/Search/MatchDoc.cfh index 66150f0..bf615b9 100644 --- a/core/Lucy/Search/MatchDoc.cfh +++ b/core/Lucy/Search/MatchDoc.cfh @@ -31,10 +31,10 @@ class Lucy::Search::MatchDoc inherits Clownfish::Obj { inert MatchDoc* init(MatchDoc *self, int32_t doc_id, float score, Vector *values = NULL); - public void + void Serialize(MatchDoc *self, OutStream *outstream); - public incremented MatchDoc* + incremented MatchDoc* Deserialize(decremented MatchDoc *self, InStream *instream); int32_t http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/NoMatchQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/NoMatchQuery.cfh b/core/Lucy/Search/NoMatchQuery.cfh index 52c1055..971a548 100644 --- a/core/Lucy/Search/NoMatchQuery.cfh +++ b/core/Lucy/Search/NoMatchQuery.cfh @@ -47,10 +47,10 @@ public class Lucy::Search::NoMatchQuery inherits Lucy::Search::Query { public incremented NoMatchQuery* Load(NoMatchQuery *self, Obj *dump); - public void + void Serialize(NoMatchQuery *self, OutStream *outstream); - public incremented NoMatchQuery* + incremented NoMatchQuery* Deserialize(decremented NoMatchQuery *self, InStream *instream); public bool http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/PhraseQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/PhraseQuery.cfh b/core/Lucy/Search/PhraseQuery.cfh index a778e15..b9212da 100644 --- a/core/Lucy/Search/PhraseQuery.cfh +++ b/core/Lucy/Search/PhraseQuery.cfh @@ -57,10 +57,10 @@ public class Lucy::Search::PhraseQuery inherits Lucy::Search::Query { public incremented String* To_String(PhraseQuery *self); - public void + void Serialize(PhraseQuery *self, OutStream *outstream); - public incremented PhraseQuery* + incremented PhraseQuery* Deserialize(decremented PhraseQuery *self, InStream *instream); public incremented Obj* @@ -107,10 +107,10 @@ class Lucy::Search::PhraseCompiler public bool Equals(PhraseCompiler *self, Obj *other); - public void + void Serialize(PhraseCompiler *self, OutStream *outstream); - public incremented PhraseCompiler* + incremented PhraseCompiler* Deserialize(decremented PhraseCompiler *self, InStream *instream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/PolyQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/PolyQuery.cfh b/core/Lucy/Search/PolyQuery.cfh index 994b434..a61220c 100644 --- a/core/Lucy/Search/PolyQuery.cfh +++ b/core/Lucy/Search/PolyQuery.cfh @@ -47,10 +47,10 @@ public abstract class Lucy::Search::PolyQuery inherits Lucy::Search::Query { Vector* Get_Children(PolyQuery *self); - public void + void Serialize(PolyQuery *self, OutStream *outstream); - public incremented PolyQuery* + incremented PolyQuery* Deserialize(decremented PolyQuery *self, InStream *instream); public incremented Obj* @@ -90,10 +90,10 @@ abstract class Lucy::Search::PolyCompiler inherits Lucy::Search::Compiler { public void Destroy(PolyCompiler *self); - public void + void Serialize(PolyCompiler *self, OutStream *outstream); - public incremented PolyCompiler* + incremented PolyCompiler* Deserialize(decremented PolyCompiler *self, InStream *instream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/Query.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/Query.cfh b/core/Lucy/Search/Query.cfh index 116fb82..cb8aec2 100644 --- a/core/Lucy/Search/Query.cfh +++ b/core/Lucy/Search/Query.cfh @@ -71,10 +71,10 @@ public class Lucy::Search::Query inherits Clownfish::Obj { public float Get_Boost(Query *self); - public void + void Serialize(Query *self, OutStream *outstream); - public incremented Query* + incremented Query* Deserialize(decremented Query *self, InStream *instream); public incremented Obj* http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/RangeQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/RangeQuery.cfh b/core/Lucy/Search/RangeQuery.cfh index d4b133d..e3080c4 100644 --- a/core/Lucy/Search/RangeQuery.cfh +++ b/core/Lucy/Search/RangeQuery.cfh @@ -63,10 +63,10 @@ public class Lucy::Search::RangeQuery inherits Lucy::Search::Query { Make_Compiler(RangeQuery *self, Searcher *searcher, float boost, bool subordinate = false); - public void + void Serialize(RangeQuery *self, OutStream *outstream); - public incremented RangeQuery* + incremented RangeQuery* Deserialize(decremented RangeQuery *self, InStream *instream); public incremented Obj* http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/SortRule.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/SortRule.cfh b/core/Lucy/Search/SortRule.cfh index 9eb3715..d9da968 100644 --- a/core/Lucy/Search/SortRule.cfh +++ b/core/Lucy/Search/SortRule.cfh @@ -62,12 +62,12 @@ public class Lucy::Search::SortRule inherits Clownfish::Obj { public bool Get_Reverse(SortRule *self); - public incremented SortRule* - Deserialize(decremented SortRule *self, InStream *instream); - - public void + void Serialize(SortRule *self, OutStream *outstream); + incremented SortRule* + Deserialize(decremented SortRule *self, InStream *instream); + public void Destroy(SortRule *self); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/SortSpec.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/SortSpec.cfh b/core/Lucy/Search/SortSpec.cfh index 8df077f..a820dc3 100644 --- a/core/Lucy/Search/SortSpec.cfh +++ b/core/Lucy/Search/SortSpec.cfh @@ -41,12 +41,12 @@ public class Lucy::Search::SortSpec inherits Clownfish::Obj { public inert SortSpec* init(SortSpec *self, Vector *rules); - public incremented SortSpec* - Deserialize(decremented SortSpec *self, InStream *instream); - - public void + void Serialize(SortSpec *self, OutStream *outstream); + incremented SortSpec* + Deserialize(decremented SortSpec *self, InStream *instream); + Vector* Get_Rules(SortSpec *self); http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/TermQuery.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/TermQuery.cfh b/core/Lucy/Search/TermQuery.cfh index c4fd394..cd6e857 100644 --- a/core/Lucy/Search/TermQuery.cfh +++ b/core/Lucy/Search/TermQuery.cfh @@ -55,10 +55,10 @@ public class Lucy::Search::TermQuery inherits Lucy::Search::Query { public incremented String* To_String(TermQuery *self); - public void + void Serialize(TermQuery *self, OutStream *outstream); - public incremented TermQuery* + incremented TermQuery* Deserialize(decremented TermQuery *self, InStream *instream); public incremented Obj* @@ -106,10 +106,10 @@ class Lucy::Search::TermCompiler inherits Lucy::Search::Compiler { public bool Equals(TermCompiler *self, Obj *other); - public void + void Serialize(TermCompiler *self, OutStream *outstream); - public incremented TermCompiler* + incremented TermCompiler* Deserialize(decremented TermCompiler *self, InStream *instream); } http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/Lucy/Search/TopDocs.cfh ---------------------------------------------------------------------- diff --git a/core/Lucy/Search/TopDocs.cfh b/core/Lucy/Search/TopDocs.cfh index 2f6e4ee..ee282ab 100644 --- a/core/Lucy/Search/TopDocs.cfh +++ b/core/Lucy/Search/TopDocs.cfh @@ -52,10 +52,10 @@ class Lucy::Search::TopDocs inherits Clownfish::Obj { void Set_Total_Hits(TopDocs *self, uint32_t total_hits); - public void + void Serialize(TopDocs *self, OutStream *outstream); - public incremented TopDocs* + incremented TopDocs* Deserialize(decremented TopDocs *self, InStream *instream); public void http://git-wip-us.apache.org/repos/asf/lucy/blob/e4ecf75b/core/LucyX/Search/ProximityQuery.cfh ---------------------------------------------------------------------- diff --git a/core/LucyX/Search/ProximityQuery.cfh b/core/LucyX/Search/ProximityQuery.cfh index b5cbd85..e9d8759 100644 --- a/core/LucyX/Search/ProximityQuery.cfh +++ b/core/LucyX/Search/ProximityQuery.cfh @@ -63,10 +63,10 @@ public class LucyX::Search::ProximityQuery inherits Lucy::Search::Query { public incremented String* To_String(ProximityQuery *self); - public void + void Serialize(ProximityQuery *self, OutStream *outstream); - public incremented ProximityQuery* + incremented ProximityQuery* Deserialize(decremented ProximityQuery *self, InStream *instream); public incremented Obj* @@ -114,10 +114,10 @@ class LucyX::Search::ProximityCompiler public bool Equals(ProximityCompiler *self, Obj *other); - public void + void Serialize(ProximityCompiler *self, OutStream *outstream); - public incremented ProximityCompiler* + incremented ProximityCompiler* Deserialize(decremented ProximityCompiler *self, InStream *instream); }