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 2017/02/01 05:19:09 UTC
[10/15] lucenenet git commit: Lucene.Net.QueryParser refactor:
renamed all protected fields camelCase prefixed with m_
Lucene.Net.QueryParser refactor: renamed all protected fields camelCase prefixed with m_
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b170b54b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b170b54b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b170b54b
Branch: refs/heads/api-work
Commit: b170b54bbb57e3b81e37abf74e15bebaacc2dd60
Parents: f09f5ce
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 10:32:00 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 10:32:00 2017 +0700
----------------------------------------------------------------------
.../Classic/MultiFieldQueryParser.cs | 44 ++---
.../Classic/QueryParserBase.cs | 8 +-
.../Classic/QueryParserTokenManager.cs | 190 +++++++++----------
.../ComplexPhrase/ComplexPhraseQueryParser.cs | 4 +-
.../Flexible/Core/Nodes/AnyQueryNode.cs | 2 +-
.../Flexible/Core/Nodes/FieldQueryNode.cs | 70 +++----
.../Flexible/Core/Nodes/FuzzyQueryNode.cs | 8 +-
.../Flexible/Core/Nodes/ProximityQueryNode.cs | 2 +-
.../Flexible/Core/Nodes/QueryNodeImpl.cs | 4 +-
.../Flexible/Core/Nodes/QuotedFieldQueryNode.cs | 8 +-
.../Flexible/Core/QueryNodeException.cs | 12 +-
.../Flexible/Core/QueryNodeParseException.cs | 4 +-
.../Standard/Nodes/PrefixWildcardQueryNode.cs | 2 +-
.../Standard/Nodes/WildcardQueryNode.cs | 8 +-
.../Flexible/Standard/Parser/ParseException.cs | 2 +-
.../Parser/StandardSyntaxParserTokenManager.cs | 178 ++++++++---------
.../Simple/SimpleQueryParser.cs | 60 +++---
.../Surround/Parser/QueryParserTokenManager.cs | 140 +++++++-------
.../Surround/Query/ComposedQuery.cs | 16 +-
.../Surround/Query/DistanceRewriteQuery.cs | 2 +-
.../Surround/Query/RewriteQuery.cs | 30 +--
.../Surround/Query/SimpleTermRewriteQuery.cs | 4 +-
src/Lucene.Net.QueryParser/Xml/CoreParser.cs | 66 +++----
.../Xml/CorePlusExtensionsParser.cs | 12 +-
24 files changed, 438 insertions(+), 438 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs b/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs
index 73c906c..ba8f479 100644
--- a/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Classic/MultiFieldQueryParser.cs
@@ -28,8 +28,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// </summary>
public class MultiFieldQueryParser : QueryParser
{
- protected internal string[] fields;
- protected internal IDictionary<string, float> boosts;
+ protected string[] m_fields;
+ protected IDictionary<string, float> m_boosts;
/// <summary>
/// Creates a <see cref="MultiFieldQueryParser"/>. Allows passing of a map with term to
@@ -69,7 +69,7 @@ namespace Lucene.Net.QueryParsers.Classic
public MultiFieldQueryParser(LuceneVersion matchVersion, string[] fields, Analyzer analyzer, IDictionary<string, float> boosts)
: this(matchVersion, fields, analyzer)
{
- this.boosts = boosts;
+ this.m_boosts = boosts;
}
/// <summary>
@@ -101,7 +101,7 @@ namespace Lucene.Net.QueryParsers.Classic
public MultiFieldQueryParser(LuceneVersion matchVersion, string[] fields, Analyzer analyzer)
: base(matchVersion, null, analyzer)
{
- this.fields = fields;
+ this.m_fields = fields;
}
protected internal override Query GetFieldQuery(string field, string queryText, int slop)
@@ -109,16 +109,16 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- Query q = base.GetFieldQuery(fields[i], queryText, true);
+ Query q = base.GetFieldQuery(m_fields[i], queryText, true);
if (q != null)
{
//If the user passes a map of boosts
- if (boosts != null)
+ if (m_boosts != null)
{
//Get the boost from the map and apply them
- float boost = boosts[fields[i]];
+ float boost = m_boosts[m_fields[i]];
q.Boost = boost;
}
ApplySlop(q, slop);
@@ -152,16 +152,16 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- Query q = base.GetFieldQuery(fields[i], queryText, quoted);
+ Query q = base.GetFieldQuery(m_fields[i], queryText, quoted);
if (q != null)
{
//If the user passes a map of boosts
- if (boosts != null)
+ if (m_boosts != null)
{
//Get the boost from the map and apply them
- float boost = boosts[fields[i]];
+ float boost = m_boosts[m_fields[i]];
q.Boost = boost;
}
clauses.Add(new BooleanClause(q, Occur.SHOULD));
@@ -180,9 +180,9 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- clauses.Add(new BooleanClause(GetFuzzyQuery(fields[i], termStr, minSimilarity), Occur.SHOULD));
+ clauses.Add(new BooleanClause(GetFuzzyQuery(m_fields[i], termStr, minSimilarity), Occur.SHOULD));
}
return GetBooleanQuery(clauses, true);
}
@@ -194,9 +194,9 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- clauses.Add(new BooleanClause(GetPrefixQuery(fields[i], termStr), Occur.SHOULD));
+ clauses.Add(new BooleanClause(GetPrefixQuery(m_fields[i], termStr), Occur.SHOULD));
}
return GetBooleanQuery(clauses, true);
}
@@ -208,9 +208,9 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- clauses.Add(new BooleanClause(GetWildcardQuery(fields[i], termStr), Occur.SHOULD));
+ clauses.Add(new BooleanClause(GetWildcardQuery(m_fields[i], termStr), Occur.SHOULD));
}
return GetBooleanQuery(clauses, true);
}
@@ -223,9 +223,9 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- clauses.Add(new BooleanClause(GetRangeQuery(fields[i], part1, part2, startInclusive, endInclusive), Occur.SHOULD));
+ clauses.Add(new BooleanClause(GetRangeQuery(m_fields[i], part1, part2, startInclusive, endInclusive), Occur.SHOULD));
}
return GetBooleanQuery(clauses, true);
}
@@ -237,9 +237,9 @@ namespace Lucene.Net.QueryParsers.Classic
if (field == null)
{
IList<BooleanClause> clauses = new List<BooleanClause>();
- for (int i = 0; i < fields.Length; i++)
+ for (int i = 0; i < m_fields.Length; i++)
{
- clauses.Add(new BooleanClause(GetRegexpQuery(fields[i], termStr),
+ clauses.Add(new BooleanClause(GetRegexpQuery(m_fields[i], termStr),
Occur.SHOULD));
}
return GetBooleanQuery(clauses, true);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
index 7f3a2a7..3fea10d 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
@@ -89,7 +89,7 @@ namespace Lucene.Net.QueryParsers.Classic
// LUCENENET-423 - DateRange differences with Java and .NET
private bool _useJavaStyleDateRangeParsing = false;
- protected string field;
+ protected string m_field;
//int phraseSlop = 0;
//float fuzzyMinSim = FuzzyQuery.DefaultMinSimilarity;
//int fuzzyPrefixLength = FuzzyQuery.DefaultPrefixLength;
@@ -145,7 +145,7 @@ namespace Lucene.Net.QueryParsers.Classic
public virtual void Init(LuceneVersion matchVersion, string f, Analyzer a)
{
Analyzer = a;
- field = f;
+ m_field = f;
#pragma warning disable 612, 618
if (matchVersion.OnOrAfter(LuceneVersion.LUCENE_31))
#pragma warning restore 612, 618
@@ -173,7 +173,7 @@ namespace Lucene.Net.QueryParsers.Classic
try
{
// TopLevelQuery is a Query followed by the end-of-input (EOF)
- Query res = TopLevelQuery(field);
+ Query res = TopLevelQuery(m_field);
return res != null ? res : NewBooleanQuery(false);
}
catch (ParseException tme)
@@ -196,7 +196,7 @@ namespace Lucene.Net.QueryParsers.Classic
/// </summary>
public virtual string Field
{
- get { return field; }
+ get { return m_field; }
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/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 840a39b..8e5da42 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.QueryParsers.Classic
}
private int JjMoveStringLiteralDfa0_2()
{
- switch (curChar)
+ switch (m_curChar)
{
case (char) (40):
@@ -102,7 +102,7 @@ namespace Lucene.Net.QueryParsers.Classic
jjmatchedPos = pos;
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (IOException)
{
@@ -125,9 +125,9 @@ namespace Lucene.Net.QueryParsers.Classic
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- ulong l = (ulong) (1L << (int) curChar);
+ ulong l = (ulong) (1L << (int) m_curChar);
do
{
switch (jjstateSet[--i])
@@ -156,9 +156,9 @@ namespace Lucene.Net.QueryParsers.Classic
}
else if ((0x280200000000L & l) != 0L)
jjstateSet[jjnewStateCnt++] = 15;
- else if (curChar == 47)
+ else if (m_curChar == 47)
JjCheckNAddStates(0, 2);
- else if (curChar == 34)
+ else if (m_curChar == 34)
JjCheckNAddStates(3, 5);
if ((0x7bff50f8ffffd9ffL & l) != 0L)
{
@@ -166,32 +166,32 @@ namespace Lucene.Net.QueryParsers.Classic
kind = 20;
JjCheckNAddStates(6, 10);
}
- else if (curChar == 42)
+ else if (m_curChar == 42)
{
if (kind > 22)
kind = 22;
}
- else if (curChar == 33)
+ else if (m_curChar == 33)
{
if (kind > 10)
kind = 10;
}
- if (curChar == 38)
+ if (m_curChar == 38)
jjstateSet[jjnewStateCnt++] = 4;
break;
case 4:
- if (curChar == 38 && kind > 8)
+ if (m_curChar == 38 && kind > 8)
kind = 8;
break;
case 5:
- if (curChar == 38)
+ if (m_curChar == 38)
jjstateSet[jjnewStateCnt++] = 4;
break;
case 13:
- if (curChar == 33 && kind > 10)
+ if (m_curChar == 33 && kind > 10)
kind = 10;
break;
@@ -204,7 +204,7 @@ namespace Lucene.Net.QueryParsers.Classic
kind = 13;
break;
case 16:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(3, 5);
break;
case 17:
@@ -217,7 +217,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 20:
- if (curChar == 34 && kind > 19)
+ if (m_curChar == 34 && kind > 19)
kind = 19;
break;
@@ -230,7 +230,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 23:
- if (curChar == 46)
+ if (m_curChar == 46)
JjCheckNAdd(24);
break;
@@ -271,7 +271,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 31:
- if (curChar == 42 && kind > 22)
+ if (m_curChar == 42 && kind > 22)
kind = 22;
break;
@@ -289,7 +289,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 36:
case 38:
- if (curChar == 47)
+ if (m_curChar == 47)
JjCheckNAddStates(0, 2);
break;
case 37:
@@ -297,7 +297,7 @@ namespace Lucene.Net.QueryParsers.Classic
JjCheckNAddStates(0, 2);
break;
case 40:
- if (curChar == 47 && kind > 24)
+ if (m_curChar == 47 && kind > 24)
kind = 24;
break;
case 41:
@@ -333,13 +333,13 @@ namespace Lucene.Net.QueryParsers.Classic
}
while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
// NOTE: This didn't change in Java from 3.0.1 to 4.8.0, but it is different in .NET.
// But changing it back made more tests pass, so I am working under the assumption 63
// is the correct value.
//ulong l = (ulong)(1L << (curChar & 077));
- ulong l = (ulong) (1L << (curChar & 63));
+ ulong l = (ulong) (1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -352,7 +352,7 @@ namespace Lucene.Net.QueryParsers.Classic
kind = 23;
JjCheckNAddTwoStates(33, 34);
}
- else if (curChar == 92)
+ else if (m_curChar == 92)
JjCheckNAddTwoStates(35, 35);
break;
@@ -363,9 +363,9 @@ namespace Lucene.Net.QueryParsers.Classic
kind = 20;
JjCheckNAddStates(6, 10);
}
- else if (curChar == 92)
+ else if (m_curChar == 92)
JjCheckNAddStates(21, 23);
- else if (curChar == 126)
+ else if (m_curChar == 126)
{
if (kind > 21)
kind = 21;
@@ -377,63 +377,63 @@ namespace Lucene.Net.QueryParsers.Classic
kind = 23;
JjCheckNAddTwoStates(33, 34);
}
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 11;
- else if (curChar == 124)
+ else if (m_curChar == 124)
jjstateSet[jjnewStateCnt++] = 8;
- else if (curChar == 79)
+ else if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 6;
- else if (curChar == 65)
+ else if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 2;
break;
case 1:
- if (curChar == 68 && kind > 8)
+ if (m_curChar == 68 && kind > 8)
kind = 8;
break;
case 2:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 1;
break;
case 3:
- if (curChar == 65)
+ if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 2;
break;
case 6:
- if (curChar == 82 && kind > 9)
+ if (m_curChar == 82 && kind > 9)
kind = 9;
break;
case 7:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 6;
break;
case 8:
- if (curChar == 124 && kind > 9)
+ if (m_curChar == 124 && kind > 9)
kind = 9;
break;
case 9:
- if (curChar == 124)
+ if (m_curChar == 124)
jjstateSet[jjnewStateCnt++] = 8;
break;
case 10:
- if (curChar == 84 && kind > 10)
+ if (m_curChar == 84 && kind > 10)
kind = 10;
break;
case 11:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 10;
break;
case 12:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 11;
break;
@@ -443,7 +443,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 18:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 19;
break;
@@ -452,7 +452,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 21:
- if (curChar != 126)
+ if (m_curChar != 126)
break;
if (kind > 21)
kind = 21;
@@ -468,7 +468,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 26:
- if (curChar == 92)
+ if (m_curChar == 92)
JjAddStates(27, 28);
break;
@@ -487,7 +487,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 29:
- if (curChar == 92)
+ if (m_curChar == 92)
JjAddStates(29, 30);
break;
case 30:
@@ -510,7 +510,7 @@ namespace Lucene.Net.QueryParsers.Classic
JjCheckNAddTwoStates(33, 34);
break;
case 34:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddTwoStates(35, 35);
break;
case 35:
@@ -522,7 +522,7 @@ namespace Lucene.Net.QueryParsers.Classic
JjAddStates(0, 2);
break;
case 39:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 38;
break;
case 41:
@@ -540,7 +540,7 @@ namespace Lucene.Net.QueryParsers.Classic
JjCheckNAddTwoStates(42, 43);
break;
case 43:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddTwoStates(44, 44);
break;
case 44:
@@ -553,14 +553,14 @@ namespace Lucene.Net.QueryParsers.Classic
JjCheckNAddStates(18, 20);
break;
case 46:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddTwoStates(47, 47);
break;
case 47:
JjCheckNAddStates(18, 20);
break;
case 48:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddStates(21, 23);
break;
@@ -572,11 +572,11 @@ namespace Lucene.Net.QueryParsers.Classic
}
else
{
- int hiByte = (int) (curChar >> 8);
+ int hiByte = (int) (m_curChar >> 8);
int i1 = hiByte >> 6;
ulong l1 = (ulong) (1L << (hiByte & 63));
- int i2 = (curChar & 0xff) >> 6;
- ulong l2 = (ulong) (1L << (curChar & 63));
+ int i2 = (m_curChar & 0xff) >> 6;
+ ulong l2 = (ulong) (1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -719,7 +719,7 @@ namespace Lucene.Net.QueryParsers.Classic
return curPos;
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (System.IO.IOException)
{
@@ -742,9 +742,9 @@ namespace Lucene.Net.QueryParsers.Classic
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- ulong l = (ulong) (1L << (int) curChar);
+ ulong l = (ulong) (1L << (int) m_curChar);
do
{
switch (jjstateSet[--i])
@@ -759,7 +759,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 1:
- if (curChar == 46)
+ if (m_curChar == 46)
JjCheckNAdd(2);
break;
@@ -777,9 +777,9 @@ namespace Lucene.Net.QueryParsers.Classic
}
while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
- ulong l = (ulong) (1L << (curChar & 63));
+ ulong l = (ulong) (1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -793,11 +793,11 @@ namespace Lucene.Net.QueryParsers.Classic
}
else
{
- int hiByte = (int) (curChar >> 8);
+ int hiByte = (int) (m_curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 63);
- int i2 = (curChar & 0xff) >> 6;
- long l2 = 1L << (curChar & 63);
+ int i2 = (m_curChar & 0xff) >> 6;
+ long l2 = 1L << (m_curChar & 63);
do
{
switch (jjstateSet[--i])
@@ -820,7 +820,7 @@ namespace Lucene.Net.QueryParsers.Classic
return curPos;
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (System.IO.IOException)
{
@@ -852,7 +852,7 @@ namespace Lucene.Net.QueryParsers.Classic
}
private int JjMoveStringLiteralDfa0_1()
{
- switch (curChar)
+ switch (m_curChar)
{
case (char)84:
@@ -873,14 +873,14 @@ namespace Lucene.Net.QueryParsers.Classic
{
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (System.IO.IOException)
{
JjStopStringLiteralDfa_1(0, active0);
return 1;
}
- switch (curChar)
+ switch (m_curChar)
{
case (char) (79):
@@ -900,7 +900,7 @@ namespace Lucene.Net.QueryParsers.Classic
jjmatchedPos = pos;
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (System.IO.IOException)
{
@@ -919,9 +919,9 @@ namespace Lucene.Net.QueryParsers.Classic
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- ulong l = (ulong) (1L << (int) curChar);
+ ulong l = (ulong) (1L << (int) m_curChar);
do
{
switch (jjstateSet[--i])
@@ -939,12 +939,12 @@ namespace Lucene.Net.QueryParsers.Classic
if (kind > 7)
kind = 7;
}
- else if (curChar == 34)
+ else if (m_curChar == 34)
JjCheckNAddTwoStates(2, 4);
break;
case 1:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddTwoStates(2, 4);
break;
@@ -954,12 +954,12 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 3:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(33, 35);
break;
case 5:
- if (curChar == 34 && kind > 31)
+ if (m_curChar == 34 && kind > 31)
kind = 31;
break;
@@ -977,9 +977,9 @@ namespace Lucene.Net.QueryParsers.Classic
}
while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
- ulong l = (ulong) (1L << (curChar & 63));
+ ulong l = (ulong) (1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -999,7 +999,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case 4:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 3;
break;
@@ -1011,11 +1011,11 @@ namespace Lucene.Net.QueryParsers.Classic
}
else
{
- int hiByte = (int) (curChar >> 8);
+ int hiByte = (int) (m_curChar >> 8);
int i1 = hiByte >> 6;
ulong l1 = (ulong) (1L << (hiByte & 63));
- int i2 = (curChar & 0xff) >> 6;
- ulong l2 = (ulong) (1L << (curChar & 63));
+ int i2 = (m_curChar & 0xff) >> 6;
+ ulong l2 = (ulong) (1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -1065,7 +1065,7 @@ namespace Lucene.Net.QueryParsers.Classic
return curPos;
try
{
- curChar = input_stream.ReadChar();
+ m_curChar = m_input_stream.ReadChar();
}
catch (System.IO.IOException)
{
@@ -1152,15 +1152,15 @@ namespace Lucene.Net.QueryParsers.Classic
};
internal static readonly ulong[] jjtoToken = new ulong[] { 0x1ffffff01L };
internal static readonly long[] jjtoSkip = new long[] { 0x80L };
- protected internal ICharStream input_stream;
+ protected ICharStream m_input_stream;
private uint[] jjrounds = new uint[49];
private int[] jjstateSet = new int[98];
- protected internal char curChar;
+ protected char m_curChar;
/// <summary>Constructor. </summary>
public QueryParserTokenManager(ICharStream stream)
{
InitBlock();
- input_stream = stream;
+ m_input_stream = stream;
}
/// <summary>Constructor. </summary>
@@ -1174,7 +1174,7 @@ namespace Lucene.Net.QueryParsers.Classic
{
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
- input_stream = stream;
+ m_input_stream = stream;
ReInitRounds();
}
private void ReInitRounds()
@@ -1210,11 +1210,11 @@ namespace Lucene.Net.QueryParsers.Classic
int beginColumn;
int endColumn;
string im = jjstrLiteralImages[jjmatchedKind];
- curTokenImage = (im == null)?input_stream.Image:im;
- beginLine = input_stream.BeginLine;
- beginColumn = input_stream.BeginColumn;
- endLine = input_stream.EndLine;
- endColumn = input_stream.EndColumn;
+ curTokenImage = (im == null)?m_input_stream.Image:im;
+ beginLine = m_input_stream.BeginLine;
+ beginColumn = m_input_stream.BeginColumn;
+ endLine = m_input_stream.EndLine;
+ endColumn = m_input_stream.EndColumn;
t = Token.NewToken(jjmatchedKind, curTokenImage);
t.beginLine = beginLine;
@@ -1243,7 +1243,7 @@ namespace Lucene.Net.QueryParsers.Classic
{
try
{
- curChar = input_stream.BeginToken();
+ m_curChar = m_input_stream.BeginToken();
}
catch (IOException)
{
@@ -1276,7 +1276,7 @@ namespace Lucene.Net.QueryParsers.Classic
if (jjmatchedKind != 0x7fffffff)
{
if (jjmatchedPos + 1 < curPos)
- input_stream.BackUp(curPos - jjmatchedPos - 1);
+ m_input_stream.BackUp(curPos - jjmatchedPos - 1);
if ((jjtoToken[jjmatchedKind >> 6] & ((ulong) 1L << (jjmatchedKind & 63))) != (ulong) 0L)
{
matchedToken = JjFillToken();
@@ -1291,19 +1291,19 @@ namespace Lucene.Net.QueryParsers.Classic
goto EOFLoop;
}
}
- int error_line = input_stream.EndLine;
- int error_column = input_stream.EndColumn;
+ int error_line = m_input_stream.EndLine;
+ int error_column = m_input_stream.EndColumn;
string error_after = null;
bool EOFSeen = false;
try
{
- input_stream.ReadChar(); input_stream.BackUp(1);
+ m_input_stream.ReadChar(); m_input_stream.BackUp(1);
}
catch (IOException)
{
EOFSeen = true;
- error_after = curPos <= 1?"":input_stream.Image;
- if (curChar == '\n' || curChar == '\r')
+ error_after = curPos <= 1?"":m_input_stream.Image;
+ if (m_curChar == '\n' || m_curChar == '\r')
{
error_line++;
error_column = 0;
@@ -1313,10 +1313,10 @@ namespace Lucene.Net.QueryParsers.Classic
}
if (!EOFSeen)
{
- input_stream.BackUp(1);
- error_after = curPos <= 1?"":input_stream.Image;
+ m_input_stream.BackUp(1);
+ error_after = curPos <= 1?"":m_input_stream.Image;
}
- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+ throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, m_curChar, TokenMgrError.LEXICAL_ERROR);
EOFLoop: ;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
index ebf32ca..02c6d2b 100644
--- a/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
@@ -241,12 +241,12 @@ namespace Lucene.Net.QueryParsers.ComplexPhrase
try
{
//temporarily set the QueryParser to be parsing the default field for this phrase e.g author:"fred* smith"
- qp.field = this.field;
+ qp.m_field = this.field;
contents = qp.Parse(phrasedQueryStringContents);
}
finally
{
- qp.field = oldDefaultParserField;
+ qp.m_field = oldDefaultParserField;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
index bb56807..bce95e4 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/AnyQueryNode.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
{
if (clause is QueryNode)
{
- ((QueryNode)clause).toQueryStringIgnoreFields = true;
+ ((QueryNode)clause).m_toQueryStringIgnoreFields = true;
}
if (clause is IFieldableNode)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
index ebb8b9d..5e1731f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FieldQueryNode.cs
@@ -29,27 +29,27 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
/// <summary>
/// The term's field
/// </summary>
- protected string field;
+ protected string m_field;
/// <summary>
/// The term's text.
/// </summary>
- protected ICharSequence text;
+ protected ICharSequence m_text;
/// <summary>
/// The term's begin position.
/// </summary>
- protected int begin;
+ protected int m_begin;
/// <summary>
/// The term's end position.
/// </summary>
- protected int end;
+ protected int m_end;
/// <summary>
/// The term's position increment.
/// </summary>
- protected int positionIncrement;
+ protected int m_positionIncrement;
/// <summary>
///
@@ -75,42 +75,42 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
public FieldQueryNode(string field, ICharSequence text, int begin,
int end)
{
- this.field = field;
- this.text = text;
- this.begin = begin;
- this.end = end;
+ this.m_field = field;
+ this.m_text = text;
+ this.m_begin = begin;
+ this.m_end = end;
this.IsLeaf = true;
}
protected virtual string GetTermEscaped(IEscapeQuerySyntax escaper)
{
- return escaper.Escape(this.text, CultureInfo.InvariantCulture /*Locale.getDefault()*/, EscapeQuerySyntaxType.NORMAL).ToString();
+ return escaper.Escape(this.m_text, CultureInfo.InvariantCulture /*Locale.getDefault()*/, EscapeQuerySyntaxType.NORMAL).ToString();
}
protected virtual string GetTermEscapeQuoted(IEscapeQuerySyntax escaper)
{
- return escaper.Escape(this.text, CultureInfo.InvariantCulture /*Locale.getDefault()*/, EscapeQuerySyntaxType.STRING).ToString();
+ return escaper.Escape(this.m_text, CultureInfo.InvariantCulture /*Locale.getDefault()*/, EscapeQuerySyntaxType.STRING).ToString();
}
public override string ToQueryString(IEscapeQuerySyntax escaper)
{
- if (IsDefaultField(this.field))
+ if (IsDefaultField(this.m_field))
{
return GetTermEscaped(escaper);
}
else
{
- return this.field + ":" + GetTermEscaped(escaper);
+ return this.m_field + ":" + GetTermEscaped(escaper);
}
}
public override string ToString()
{
- return "<field start='" + this.begin + "' end='" + this.end + "' field='"
- + this.field + "' text='" + this.text + "'/>";
+ return "<field start='" + this.m_begin + "' end='" + this.m_end + "' field='"
+ + this.m_field + "' text='" + this.m_text + "'/>";
}
/// <summary>
@@ -119,10 +119,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
/// <returns>the term</returns>
public virtual string GetTextAsString()
{
- if (this.text == null)
+ if (this.m_text == null)
return null;
else
- return this.text.ToString();
+ return this.m_text.ToString();
}
// LUCENENET TODO: this method is not required because Field is already type string in .NET
@@ -132,34 +132,34 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
/// <returns>the field</returns>
public virtual string GetFieldAsString()
{
- if (this.field == null)
+ if (this.m_field == null)
return null;
else
- return this.field.ToString();
+ return this.m_field.ToString();
}
public virtual int Begin
{
- get { return this.begin; }
- set { this.begin = value; }
+ get { return this.m_begin; }
+ set { this.m_begin = value; }
}
public virtual int End
{
- get { return this.end; }
- set { this.end = value; }
+ get { return this.m_end; }
+ set { this.m_end = value; }
}
public virtual string Field
{
- get { return this.field; }
- set { this.field = value; }
+ get { return this.m_field; }
+ set { this.m_field = value; }
}
public virtual int PositionIncrement
{
- get { return this.positionIncrement; }
- set { this.positionIncrement = value; }
+ get { return this.m_positionIncrement; }
+ set { this.m_positionIncrement = value; }
}
/// <summary>
@@ -167,19 +167,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
/// </summary>
public virtual ICharSequence Text
{
- get { return this.text; }
- set { this.text = value; }
+ get { return this.m_text; }
+ set { this.m_text = value; }
}
public override IQueryNode CloneTree()
{
FieldQueryNode fqn = (FieldQueryNode)base.CloneTree();
- fqn.begin = this.begin;
- fqn.end = this.end;
- fqn.field = this.field;
- fqn.text = this.text;
- fqn.positionIncrement = this.positionIncrement;
- fqn.toQueryStringIgnoreFields = this.toQueryStringIgnoreFields;
+ fqn.m_begin = this.m_begin;
+ fqn.m_end = this.m_end;
+ fqn.m_field = this.m_field;
+ fqn.m_text = this.m_text;
+ fqn.m_positionIncrement = this.m_positionIncrement;
+ fqn.m_toQueryStringIgnoreFields = this.m_toQueryStringIgnoreFields;
return fqn;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
index 8ba52a6..fb4ba7f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/FuzzyQueryNode.cs
@@ -69,20 +69,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
public override string ToQueryString(IEscapeQuerySyntax escaper)
{
- if (IsDefaultField(this.field))
+ if (IsDefaultField(this.m_field))
{
return GetTermEscaped(escaper) + "~" + this.similarity;
}
else
{
- return this.field + ":" + GetTermEscaped(escaper) + "~" + this.similarity;
+ return this.m_field + ":" + GetTermEscaped(escaper) + "~" + this.similarity;
}
}
public override string ToString()
{
- return "<fuzzy field='" + this.field + "' similarity='" + this.similarity
- + "' term='" + this.text + "'/>";
+ return "<fuzzy field='" + this.m_field + "' similarity='" + this.similarity
+ + "' term='" + this.m_text + "'/>";
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
index 40bcd60..3781a82 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/ProximityQueryNode.cs
@@ -105,7 +105,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
{
if (clause is FieldQueryNode)
{
- ((FieldQueryNode)clause).toQueryStringIgnoreFields = true;
+ ((FieldQueryNode)clause).m_toQueryStringIgnoreFields = true;
((FieldQueryNode)clause).Field = field;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
index 910b9ad..01321e5 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QueryNodeImpl.cs
@@ -218,7 +218,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
/// <summary>
/// If set to true the the method toQueryString will not write field names
/// </summary>
- protected internal bool toQueryStringIgnoreFields = false;
+ protected internal bool m_toQueryStringIgnoreFields = false;
/// <summary>
/// This method is use toQueryString to detect if fld is the default field
@@ -232,7 +232,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
// should receive the default field value directly by parameter
protected virtual bool IsDefaultField(string fld)
{
- if (this.toQueryStringIgnoreFields)
+ if (this.m_toQueryStringIgnoreFields)
return true;
if (fld == null)
return true;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
index c3111c0..2217b66 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Nodes/QuotedFieldQueryNode.cs
@@ -55,20 +55,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Nodes
public override string ToQueryString(IEscapeQuerySyntax escaper)
{
- if (IsDefaultField(this.field))
+ if (IsDefaultField(this.m_field))
{
return "\"" + GetTermEscapeQuoted(escaper) + "\"";
}
else
{
- return this.field + ":" + "\"" + GetTermEscapeQuoted(escaper) + "\"";
+ return this.m_field + ":" + "\"" + GetTermEscapeQuoted(escaper) + "\"";
}
}
public override string ToString()
{
- return "<quotedfield start='" + this.begin + "' end='" + this.end
- + "' field='" + this.field + "' term='" + this.text + "'/>";
+ return "<quotedfield start='" + this.m_begin + "' end='" + this.m_end
+ + "' field='" + this.m_field + "' term='" + this.m_text + "'/>";
}
public override IQueryNode CloneTree()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeException.cs b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeException.cs
index eba3e9c..3de1ca8 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeException.cs
@@ -38,12 +38,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
#endif
public class QueryNodeException : Exception, INLSException
{
- protected IMessage message = new Message(QueryParserMessages.EMPTY_MESSAGE);
+ protected IMessage m_message = new Message(QueryParserMessages.EMPTY_MESSAGE);
public QueryNodeException(IMessage message)
: base(message.Key)
{
- this.message = message;
+ this.m_message = message;
}
public QueryNodeException(Exception throwable)
@@ -54,12 +54,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
public QueryNodeException(IMessage message, Exception throwable)
: base(message.Key, throwable)
{
- this.message = message;
+ this.m_message = message;
}
public virtual IMessage MessageObject
{
- get { return this.message; }
+ get { return this.m_message; }
}
public override string Message
@@ -74,12 +74,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
public virtual string GetLocalizedMessage(CultureInfo locale)
{
- return this.message.GetLocalizedMessage(locale);
+ return this.m_message.GetLocalizedMessage(locale);
}
public override string ToString()
{
- return this.message.Key + ": " + GetLocalizedMessage();
+ return this.m_message.Key + ": " + GetLocalizedMessage();
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
index 663c2e7..91eae73 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/QueryNodeParseException.cs
@@ -59,7 +59,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
public virtual void SetQuery(string query)
{
this.query = query;
- this.message = new Message(
+ this.m_message = new Message(
QueryParserMessages.INVALID_SYNTAX_CANNOT_PARSE, query, "");
}
@@ -79,7 +79,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core
public virtual void SetNonLocalizedMessage(IMessage message)
{
- this.message = message;
+ this.m_message = message;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
index 0348f34..99da6a9 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/PrefixWildcardQueryNode.cs
@@ -62,7 +62,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
public override string ToString()
{
- return "<prefixWildcard field='" + this.field + "' term='" + this.text
+ return "<prefixWildcard field='" + this.m_field + "' term='" + this.m_text
+ "'/>";
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
index 1228b02..5cb764d 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/WildcardQueryNode.cs
@@ -61,19 +61,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
public override string ToQueryString(IEscapeQuerySyntax escaper)
{
- if (IsDefaultField(this.field))
+ if (IsDefaultField(this.m_field))
{
- return this.text.ToString();
+ return this.m_text.ToString();
}
else
{
- return this.field + ":" + this.text;
+ return this.m_field + ":" + this.m_text;
}
}
public override string ToString()
{
- return "<wildcard field='" + this.field + "' term='" + this.text + "'/>";
+ return "<wildcard field='" + this.m_field + "' term='" + this.m_text + "'/>";
}
public override IQueryNode CloneTree()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
index 0a17b97..7c017e6 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
@@ -164,7 +164,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// <summary>
/// The end of line string for this machine.
/// </summary>
- protected string eol = Environment.NewLine;
+ protected string m_eol = Environment.NewLine;
/// <summary>
/// Used to convert raw characters to their escaped version
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
index 9c057f4..9723a47 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
private int JjMoveStringLiteralDfa0_2()
{
- switch ((int)curChar)
+ switch ((int)m_curChar)
{
case 40:
return JjStopAtPos(0, 13);
@@ -81,7 +81,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
private int JjMoveStringLiteralDfa1_2(long active0)
{
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e)
#pragma warning restore 168
@@ -89,7 +89,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjStopStringLiteralDfa_2(0, active0);
return 1;
}
- switch ((int)curChar)
+ switch ((int)m_curChar)
{
case 61:
if ((active0 & 0x40000L) != 0L)
@@ -125,9 +125,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- ulong l = (ulong)(1L << curChar);
+ ulong l = (ulong)(1L << m_curChar);
do
{
switch (jjstateSet[--i])
@@ -144,32 +144,32 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
if (kind > 7)
kind = 7;
}
- else if (curChar == 47)
+ else if (m_curChar == 47)
JjCheckNAddStates(0, 2);
- else if (curChar == 34)
+ else if (m_curChar == 34)
JjCheckNAddStates(3, 5);
- else if (curChar == 33)
+ else if (m_curChar == 33)
{
if (kind > 10)
kind = 10;
}
- if (curChar == 38)
+ if (m_curChar == 38)
jjstateSet[jjnewStateCnt++] = 4;
break;
case 4:
- if (curChar == 38 && kind > 8)
+ if (m_curChar == 38 && kind > 8)
kind = 8;
break;
case 5:
- if (curChar == 38)
+ if (m_curChar == 38)
jjstateSet[jjnewStateCnt++] = 4;
break;
case 13:
- if (curChar == 33 && kind > 10)
+ if (m_curChar == 33 && kind > 10)
kind = 10;
break;
case 14:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(3, 5);
break;
case 15:
@@ -180,7 +180,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddStates(3, 5);
break;
case 18:
- if (curChar == 34 && kind > 22)
+ if (m_curChar == 34 && kind > 22)
kind = 22;
break;
case 19:
@@ -210,7 +210,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjAddStates(6, 7);
break;
case 26:
- if (curChar == 46)
+ if (m_curChar == 46)
JjCheckNAdd(27);
break;
case 27:
@@ -222,7 +222,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
break;
case 28:
case 30:
- if (curChar == 47)
+ if (m_curChar == 47)
JjCheckNAddStates(0, 2);
break;
case 29:
@@ -230,17 +230,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddStates(0, 2);
break;
case 32:
- if (curChar == 47 && kind > 25)
+ if (m_curChar == 47 && kind > 25)
kind = 25;
break;
default: break;
}
} while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
//long l = 1L << (curChar & 077);
- ulong l = (ulong)(1L << (curChar & 63));
+ ulong l = (ulong)(1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -252,61 +252,61 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
kind = 23;
JjCheckNAddTwoStates(20, 21);
}
- else if (curChar == 126)
+ else if (m_curChar == 126)
{
if (kind > 24)
kind = 24;
jjstateSet[jjnewStateCnt++] = 25;
}
- else if (curChar == 92)
+ else if (m_curChar == 92)
JjCheckNAdd(22);
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 11;
- else if (curChar == 124)
+ else if (m_curChar == 124)
jjstateSet[jjnewStateCnt++] = 8;
- else if (curChar == 79)
+ else if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 6;
- else if (curChar == 65)
+ else if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 2;
break;
case 1:
- if (curChar == 68 && kind > 8)
+ if (m_curChar == 68 && kind > 8)
kind = 8;
break;
case 2:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 1;
break;
case 3:
- if (curChar == 65)
+ if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 2;
break;
case 6:
- if (curChar == 82 && kind > 9)
+ if (m_curChar == 82 && kind > 9)
kind = 9;
break;
case 7:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 6;
break;
case 8:
- if (curChar == 124 && kind > 9)
+ if (m_curChar == 124 && kind > 9)
kind = 9;
break;
case 9:
- if (curChar == 124)
+ if (m_curChar == 124)
jjstateSet[jjnewStateCnt++] = 8;
break;
case 10:
- if (curChar == 84 && kind > 10)
+ if (m_curChar == 84 && kind > 10)
kind = 10;
break;
case 11:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 10;
break;
case 12:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 11;
break;
case 15:
@@ -314,7 +314,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddStates(3, 5);
break;
case 16:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 17;
break;
case 17:
@@ -329,7 +329,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddTwoStates(20, 21);
break;
case 21:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddTwoStates(22, 22);
break;
case 22:
@@ -338,11 +338,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddTwoStates(20, 21);
break;
case 23:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAdd(22);
break;
case 24:
- if (curChar != 126)
+ if (m_curChar != 126)
break;
if (kind > 24)
kind = 24;
@@ -352,7 +352,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjAddStates(0, 2);
break;
case 31:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 30;
break;
default: break;
@@ -361,13 +361,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = (int)(m_curChar >> 8);
int i1 = hiByte >> 6;
//long l1 = 1L << (hiByte & 077);
ulong l1 = (ulong)(1L << (hiByte & 63));
- int i2 = (curChar & 0xff) >> 6;
+ int i2 = (m_curChar & 0xff) >> 6;
//long l2 = 1L << (curChar & 077);
- ulong l2 = (ulong)(1L << (curChar & 63));
+ ulong l2 = (ulong)(1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -422,7 +422,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
++curPos;
if ((i = jjnewStateCnt) == (startsAt = 33 - (jjnewStateCnt = startsAt)))
return curPos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e) { return curPos; }
#pragma warning restore 168
@@ -443,9 +443,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- long l = 1L << curChar;
+ long l = 1L << m_curChar;
do
{
switch (jjstateSet[--i])
@@ -458,7 +458,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjAddStates(8, 9);
break;
case 1:
- if (curChar == 46)
+ if (m_curChar == 46)
JjCheckNAdd(2);
break;
case 2:
@@ -472,10 +472,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
} while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
//long l = 1L << (curChar & 077);
- long l = 1L << (curChar & 63);
+ long l = 1L << (m_curChar & 63);
do
{
switch (jjstateSet[--i])
@@ -486,13 +486,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = (int)(m_curChar >> 8);
int i1 = hiByte >> 6;
//long l1 = 1L << (hiByte & 077);
long l1 = 1L << (hiByte & 63);
- int i2 = (curChar & 0xff) >> 6;
+ int i2 = (m_curChar & 0xff) >> 6;
//long l2 = 1L << (curChar & 077);
- long l2 = 1L << (curChar & 63);
+ long l2 = 1L << (m_curChar & 63);
do
{
switch (jjstateSet[--i])
@@ -510,7 +510,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
++curPos;
if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
return curPos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e) { return curPos; }
#pragma warning restore 168
@@ -537,7 +537,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
private int JjMoveStringLiteralDfa0_1()
{
- switch ((int)curChar)
+ switch ((int)m_curChar)
{
case 84:
return JjMoveStringLiteralDfa1_1(0x20000000L);
@@ -551,7 +551,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
private int JjMoveStringLiteralDfa1_1(long active0)
{
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e)
#pragma warning restore 168
@@ -559,7 +559,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjStopStringLiteralDfa_1(0, active0);
return 1;
}
- switch ((int)curChar)
+ switch ((int)m_curChar)
{
case 79:
if ((active0 & 0x20000000L) != 0L)
@@ -574,7 +574,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
jjmatchedKind = kind;
jjmatchedPos = pos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e) { return pos + 1; }
#pragma warning restore 168
@@ -591,9 +591,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
if (++jjround == 0x7fffffff)
ReInitRounds();
- if (curChar < 64)
+ if (m_curChar < 64)
{
- ulong l = (ulong)(1L << curChar);
+ ulong l = (ulong)(1L << m_curChar);
do
{
switch (jjstateSet[--i])
@@ -610,11 +610,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
if (kind > 7)
kind = 7;
}
- else if (curChar == 34)
+ else if (m_curChar == 34)
JjCheckNAddTwoStates(2, 4);
break;
case 1:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddTwoStates(2, 4);
break;
case 2:
@@ -622,11 +622,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjCheckNAddStates(10, 12);
break;
case 3:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(10, 12);
break;
case 5:
- if (curChar == 34 && kind > 32)
+ if (m_curChar == 34 && kind > 32)
kind = 32;
break;
case 6:
@@ -640,10 +640,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
} while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
//long l = 1L << (curChar & 077);
- ulong l = (ulong)(1L << (curChar & 63));
+ ulong l = (ulong)(1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -660,7 +660,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
JjAddStates(10, 12);
break;
case 4:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 3;
break;
default: break;
@@ -669,13 +669,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
else
{
- int hiByte = (int)(curChar >> 8);
+ int hiByte = (int)(m_curChar >> 8);
int i1 = hiByte >> 6;
//long l1 = 1L << (hiByte & 077);
ulong l1 = (ulong)(1L << (hiByte & 63));
- int i2 = (curChar & 0xff) >> 6;
+ int i2 = (m_curChar & 0xff) >> 6;
//long l2 = 1L << (curChar & 077);
- ulong l2 = (ulong)(1L << (curChar & 63));
+ ulong l2 = (ulong)(1L << (m_curChar & 63));
do
{
switch (jjstateSet[--i])
@@ -717,7 +717,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
++curPos;
if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))
return curPos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
#pragma warning disable 168
catch (IOException e) { return curPos; }
#pragma warning restore 168
@@ -788,14 +788,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
static readonly long[] jjtoSkip = {
0x80L,
};
- protected ICharStream input_stream;
+ protected ICharStream m_input_stream;
private readonly uint[] jjrounds = new uint[33];
private readonly int[] jjstateSet = new int[66];
- protected char curChar;
+ protected char m_curChar;
/// <summary>Constructor.</summary>
public StandardSyntaxParserTokenManager(ICharStream stream)
{
- input_stream = stream;
+ m_input_stream = stream;
}
/// <summary>Constructor.</summary>
@@ -810,7 +810,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
- input_stream = stream;
+ m_input_stream = stream;
ReInitRounds();
}
private void ReInitRounds()
@@ -846,11 +846,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
int beginColumn;
int endColumn;
string im = jjstrLiteralImages[jjmatchedKind];
- curTokenImage = (im == null) ? input_stream.GetImage() : im;
- beginLine = input_stream.BeginLine;
- beginColumn = input_stream.BeginColumn;
- endLine = input_stream.EndLine;
- endColumn = input_stream.EndColumn;
+ curTokenImage = (im == null) ? m_input_stream.GetImage() : im;
+ beginLine = m_input_stream.BeginLine;
+ beginColumn = m_input_stream.BeginColumn;
+ endLine = m_input_stream.EndLine;
+ endColumn = m_input_stream.EndColumn;
t = Token.NewToken(jjmatchedKind, curTokenImage);
t.beginLine = beginLine;
@@ -879,7 +879,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
try
{
- curChar = input_stream.BeginToken();
+ m_curChar = m_input_stream.BeginToken();
}
#pragma warning disable 168
catch (IOException e)
@@ -911,7 +911,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
if (jjmatchedKind != 0x7fffffff)
{
if (jjmatchedPos + 1 < curPos)
- input_stream.BackUp(curPos - jjmatchedPos - 1);
+ m_input_stream.BackUp(curPos - jjmatchedPos - 1);
if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 63 /*077*/))) != 0L)
{
matchedToken = JjFillToken();
@@ -926,18 +926,18 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
goto EOFLoop_continue;
}
}
- int error_line = input_stream.EndLine;
- int error_column = input_stream.EndColumn;
+ int error_line = m_input_stream.EndLine;
+ int error_column = m_input_stream.EndColumn;
string error_after = null;
bool EOFSeen = false;
- try { input_stream.ReadChar(); input_stream.BackUp(1); }
+ try { m_input_stream.ReadChar(); m_input_stream.BackUp(1); }
#pragma warning disable 168
catch (IOException e1)
#pragma warning restore 168
{
EOFSeen = true;
- error_after = curPos <= 1 ? "" : input_stream.GetImage();
- if (curChar == '\n' || curChar == '\r')
+ error_after = curPos <= 1 ? "" : m_input_stream.GetImage();
+ if (m_curChar == '\n' || m_curChar == '\r')
{
error_line++;
error_column = 0;
@@ -947,10 +947,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
if (!EOFSeen)
{
- input_stream.BackUp(1);
- error_after = curPos <= 1 ? "" : input_stream.GetImage();
+ m_input_stream.BackUp(1);
+ error_after = curPos <= 1 ? "" : m_input_stream.GetImage();
}
- throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, curChar, TokenMgrError.LEXICAL_ERROR);
+ throw new TokenMgrError(EOFSeen, curLexState, error_line, error_column, error_after, m_curChar, TokenMgrError.LEXICAL_ERROR);
EOFLoop_continue: { }
}