You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2016/12/06 15:12:21 UTC
[46/58] lucenenet git commit: QueryParser.Classic +
QueryParser.Surround refactor: Changed ICharStream.Backup() to
ICharStream.BackUp()
QueryParser.Classic + QueryParser.Surround refactor: Changed ICharStream.Backup() to ICharStream.BackUp()
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/98a37e1f
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/98a37e1f
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/98a37e1f
Branch: refs/heads/master
Commit: 98a37e1f4fd157b904fec6b0682fad0c4f74b54d
Parents: 3e2eb28
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Tue Dec 6 00:01:40 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Tue Dec 6 00:01:40 2016 +0700
----------------------------------------------------------------------
src/Lucene.Net.QueryParser/Classic/CharStream.cs | 2 +-
src/Lucene.Net.QueryParser/Classic/FastCharStream.cs | 2 +-
src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs | 6 +++---
src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs | 2 +-
src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs | 2 +-
.../Surround/Parser/QueryParserTokenManager.cs | 6 +++---
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Classic/CharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/CharStream.cs b/src/Lucene.Net.QueryParser/Classic/CharStream.cs
index 7da1942..8f1783d 100644
--- a/src/Lucene.Net.QueryParser/Classic/CharStream.cs
+++ b/src/Lucene.Net.QueryParser/Classic/CharStream.cs
@@ -93,7 +93,7 @@ namespace Lucene.Net.QueryParsers.Classic
/// (longer) token. So, they will be used again as the prefix of the next
/// token and it is the implemetation's responsibility to do this right.
/// </summary>
- void Backup(int amount);
+ void BackUp(int amount);
/// <summary>
/// Returns the next character that marks the beginning of the next token.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
index 954e425..8f963ee 100644
--- a/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
+++ b/src/Lucene.Net.QueryParser/Classic/FastCharStream.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.QueryParsers.Classic
return ReadChar();
}
- public void Backup(int amount)
+ public void BackUp(int amount)
{
bufferPosition -= amount;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
index cc5191f..a2f6010 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
@@ -1276,7 +1276,7 @@ namespace Lucene.Net.QueryParsers.Classic
if (jjmatchedKind != 0x7fffffff)
{
if (jjmatchedPos + 1 < curPos)
- input_stream.Backup(curPos - jjmatchedPos - 1);
+ input_stream.BackUp(curPos - jjmatchedPos - 1);
if ((jjtoToken[jjmatchedKind >> 6] & ((ulong) 1L << (jjmatchedKind & 63))) != (ulong) 0L)
{
matchedToken = JjFillToken();
@@ -1297,7 +1297,7 @@ namespace Lucene.Net.QueryParsers.Classic
bool EOFSeen = false;
try
{
- input_stream.ReadChar(); input_stream.Backup(1);
+ input_stream.ReadChar(); input_stream.BackUp(1);
}
catch (IOException)
{
@@ -1313,7 +1313,7 @@ namespace Lucene.Net.QueryParsers.Classic
}
if (!EOFSeen)
{
- input_stream.Backup(1);
+ input_stream.BackUp(1);
error_after = curPos <= 1?"":input_stream.Image;
}
throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs b/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs
index 8136f0f..f4d7326 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/CharStream.cs
@@ -93,7 +93,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// (longer) token. So, they will be used again as the prefix of the next
/// token and it is the implemetation's responsibility to do this right.
/// </summary>
- void Backup(int amount);
+ void BackUp(int amount);
/// <summary>
/// Returns the next character that marks the beginning of the next token.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
index 24a7102..26eba8e 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/FastCharStream.cs
@@ -96,7 +96,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
return ReadChar();
}
- public void Backup(int amount)
+ public void BackUp(int amount)
{
bufferPosition -= amount;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/98a37e1f/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
index 84f7250..36774f9 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
@@ -685,7 +685,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
if (jjmatchedKind != 0x7fffffff)
{
if (jjmatchedPos + 1 < curPos)
- input_stream.Backup(curPos - jjmatchedPos - 1);
+ input_stream.BackUp(curPos - jjmatchedPos - 1);
if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 63 /*077*/))) != 0L)
{
matchedToken = JjFillToken();
@@ -704,7 +704,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
int error_column = input_stream.EndColumn;
string error_after = null;
bool EOFSeen = false;
- try { input_stream.ReadChar(); input_stream.Backup(1); }
+ try { input_stream.ReadChar(); input_stream.BackUp(1); }
catch (System.IO.IOException /*e1*/)
{
EOFSeen = true;
@@ -719,7 +719,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
if (!EOFSeen)
{
- input_stream.Backup(1);
+ input_stream.BackUp(1);
error_after = curPos <= 1 ? "" : input_stream.Image;
}
throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);