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 2015/10/30 15:52:03 UTC
[4/8] lucy git commit: Adjust for Skip_Whitespace changes
Adjust for Skip_Whitespace changes
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/6de52a6f
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/6de52a6f
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/6de52a6f
Branch: refs/heads/master
Commit: 6de52a6f07a224a4df15a867baaa0a43d5edae6d
Parents: fde7f8c
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat Oct 24 15:42:27 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat Oct 24 15:42:27 2015 +0200
----------------------------------------------------------------------
core/Lucy/Highlight/Highlighter.c | 6 +++---
core/Lucy/Search/QueryParser.c | 4 ++--
core/Lucy/Search/QueryParser/QueryLexer.c | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/6de52a6f/core/Lucy/Highlight/Highlighter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Highlight/Highlighter.c b/core/Lucy/Highlight/Highlighter.c
index 9aeece0..2ce62cd 100644
--- a/core/Lucy/Highlight/Highlighter.c
+++ b/core/Lucy/Highlight/Highlighter.c
@@ -228,7 +228,7 @@ S_find_starting_boundary(StringIterator *top, uint32_t max_skip,
if (code_point == STRITER_DONE || code_point == '.') {
// Skip remaining whitespace.
- *num_skipped_ptr = StrIter_Skip_Next_Whitespace(top);
+ *num_skipped_ptr = StrIter_Skip_Whitespace(top);
DECREF(iter);
return true;
}
@@ -271,7 +271,7 @@ S_find_starting_boundary(StringIterator *top, uint32_t max_skip,
}
// Skip remaining whitespace.
- num_skipped += StrIter_Skip_Next_Whitespace(top);
+ num_skipped += StrIter_Skip_Whitespace(top);
*num_skipped_ptr = num_skipped;
DECREF(word);
@@ -298,7 +298,7 @@ S_find_ending_boundary(StringIterator *tail, uint32_t max_skip,
if (code_point == STRITER_DONE) {
// Skip remaining whitespace.
- *num_skipped_ptr = StrIter_Skip_Prev_Whitespace(tail);
+ *num_skipped_ptr = StrIter_Skip_Whitespace_Back(tail);
DECREF(iter);
return true;
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/6de52a6f/core/Lucy/Search/QueryParser.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser.c b/core/Lucy/Search/QueryParser.c
index dce7fb6..7695c61 100644
--- a/core/Lucy/Search/QueryParser.c
+++ b/core/Lucy/Search/QueryParser.c
@@ -874,8 +874,8 @@ QParser_Expand_Leaf_IMP(QueryParser *self, Query *query) {
// If quoted, always generate PhraseQuery.
StringIterator *top = Str_Top(full_text);
StringIterator *tail = Str_Tail(full_text);
- StrIter_Skip_Next_Whitespace(top);
- StrIter_Skip_Prev_Whitespace(tail);
+ StrIter_Skip_Whitespace(top);
+ StrIter_Skip_Whitespace_Back(tail);
if (StrIter_Starts_With_Utf8(top, "\"", 1)) {
is_phrase = true;
StrIter_Advance(top, 1);
http://git-wip-us.apache.org/repos/asf/lucy/blob/6de52a6f/core/Lucy/Search/QueryParser/QueryLexer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/QueryParser/QueryLexer.c b/core/Lucy/Search/QueryParser/QueryLexer.c
index 76596c4..1a9f54f 100644
--- a/core/Lucy/Search/QueryParser/QueryLexer.c
+++ b/core/Lucy/Search/QueryParser/QueryLexer.c
@@ -82,7 +82,7 @@ QueryLexer_Tokenize_IMP(QueryLexer *self, String *query_string) {
while (StrIter_Has_Next(iter)) {
ParserElem *elem = NULL;
- if (StrIter_Skip_Next_Whitespace(iter)) {
+ if (StrIter_Skip_Whitespace(iter)) {
// Fast-forward past whitespace.
continue;
}
@@ -104,7 +104,7 @@ QueryLexer_Tokenize_IMP(QueryLexer *self, String *query_string) {
break;
case '+':
if (StrIter_Has_Next(iter)
- && !StrIter_Skip_Next_Whitespace(iter)
+ && !StrIter_Skip_Whitespace(iter)
) {
elem = ParserElem_new(TOKEN_PLUS, NULL);
}
@@ -114,7 +114,7 @@ QueryLexer_Tokenize_IMP(QueryLexer *self, String *query_string) {
break;
case '-':
if (StrIter_Has_Next(iter)
- && !StrIter_Skip_Next_Whitespace(iter)
+ && !StrIter_Skip_Whitespace(iter)
) {
elem = ParserElem_new(TOKEN_MINUS, NULL);
}