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:00 UTC
[01/15] lucenenet git commit: Lucene.Net.Tests.Sandbox: Added API
consistency tests
Repository: lucenenet
Updated Branches:
refs/heads/api-work 439a1988a -> a6168d076
Lucene.Net.Tests.Sandbox: Added API consistency tests
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a79fd089
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a79fd089
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a79fd089
Branch: refs/heads/api-work
Commit: a79fd0890b512e8d93289b6f572d3b34ca101d32
Parents: 439a198
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:45:49 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:45:49 2017 +0700
----------------------------------------------------------------------
.../Lucene.Net.Tests.Sandbox.csproj | 1 +
.../TestApiConsistency.cs | 120 +++++++++++++++++++
2 files changed, 121 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a79fd089/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
index 0244caa..1ff7bdf 100644
--- a/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
+++ b/src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj
@@ -49,6 +49,7 @@
<Compile Include="Queries\TestSortedSetSortField.cs" />
<Compile Include="Queries\TestSortedSetSortFieldDocValues.cs" />
<Compile Include="Queries\TestSortedSetSortFieldSelectors.cs" />
+ <Compile Include="TestApiConsistency.cs" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a79fd089/src/Lucene.Net.Tests.Sandbox/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Sandbox/TestApiConsistency.cs b/src/Lucene.Net.Tests.Sandbox/TestApiConsistency.cs
new file mode 100644
index 0000000..5daba24
--- /dev/null
+++ b/src/Lucene.Net.Tests.Sandbox/TestApiConsistency.cs
@@ -0,0 +1,120 @@
+\ufeffusing Lucene.Net.Attributes;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System;
+
+namespace Lucene.Net.Sandbox
+{
+ /// <summary>
+ /// LUCENENET specific tests for ensuring API conventions are followed
+ /// </summary>
+ public class TestApiConsistency : ApiScanTestBase
+ {
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestProtectedFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestProtectedFieldNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestPrivateFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestPrivateFieldNames(typeFromTargetAssembly, @"Snowball\.Ext\..+Stemmer");
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestPublicFields(Type typeFromTargetAssembly)
+ {
+ base.TestPublicFields(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestMethodParameterNames(Type typeFromTargetAssembly)
+ {
+ base.TestMethodParameterNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestInterfaceNames(Type typeFromTargetAssembly)
+ {
+ base.TestInterfaceNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestClassNames(Type typeFromTargetAssembly)
+ {
+ base.TestClassNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPropertiesWithNoGetter(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesWithNoGetter(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPropertiesThatReturnArray(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
+ {
+ base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPublicMembersContainingComparer(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingComparer(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPublicMembersNamedSize(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersNamedSize(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPublicMembersContainingNonNetNumeric(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingNonNetNumeric(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersWithNullableEnum(typeFromTargetAssembly);
+ }
+
+ // LUCENENET NOTE: This test is only for identifying members who were changed from
+ // ICollection, IList or ISet to IEnumerable during the port (that should be changed back)
+ //[Test, LuceneNetSpecific]
+ //[TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ //public override void TestForMembersAcceptingOrReturningIEnumerable(Type typeFromTargetAssembly)
+ //{
+ // base.TestForMembersAcceptingOrReturningIEnumerable(typeFromTargetAssembly);
+ //}
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
+ public override void TestForMembersAcceptingOrReturningListOrDictionary(Type typeFromTargetAssembly)
+ {
+ base.TestForMembersAcceptingOrReturningListOrDictionary(typeFromTargetAssembly);
+ }
+ }
+}
[09/15] lucenenet git commit: Lucene.Net.QueryParser refactor:
renamed all protected fields camelCase prefixed with m_
Posted by ni...@apache.org.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs b/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
index 7a4b1b9..ff0b637 100644
--- a/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
@@ -93,13 +93,13 @@ namespace Lucene.Net.QueryParsers.Simple
public class SimpleQueryParser : QueryBuilder
{
/// <summary>Map of fields to query against with their weights</summary>
- protected readonly IDictionary<string, float> weights;
+ protected readonly IDictionary<string, float> m_weights;
// LUCENENET specific - Made the int operator constants into a [Flags] enum
// to make them easier to pass in .NET.
/// <summary>flags to the parser (to turn features on/off)</summary>
- protected readonly Operator flags;
+ protected readonly Operator m_flags;
[Flags]
public enum Operator : int
@@ -146,8 +146,8 @@ namespace Lucene.Net.QueryParsers.Simple
public SimpleQueryParser(Analyzer analyzer, IDictionary<string, float> weights, Operator flags)
: base(analyzer)
{
- this.weights = weights;
- this.flags = flags;
+ this.m_weights = weights;
+ this.m_flags = flags;
}
/// <summary>Parses the query text and returns parsed query (or null if empty)</summary>
@@ -165,22 +165,22 @@ namespace Lucene.Net.QueryParsers.Simple
{
while (state.Index < state.Length)
{
- if (state.Data[state.Index] == '(' && (flags & Operator.PRECEDENCE_OPERATORS) != 0)
+ if (state.Data[state.Index] == '(' && (m_flags & Operator.PRECEDENCE_OPERATORS) != 0)
{
// the beginning of a subquery has been found
ConsumeSubQuery(state);
}
- else if (state.Data[state.Index] == ')' && (flags & Operator.PRECEDENCE_OPERATORS) != 0)
+ else if (state.Data[state.Index] == ')' && (m_flags & Operator.PRECEDENCE_OPERATORS) != 0)
{
// this is an extraneous character so it is ignored
++state.Index;
}
- else if (state.Data[state.Index] == '"' && (flags & Operator.PHRASE_OPERATOR) != 0)
+ else if (state.Data[state.Index] == '"' && (m_flags & Operator.PHRASE_OPERATOR) != 0)
{
// the beginning of a phrase has been found
ConsumePhrase(state);
}
- else if (state.Data[state.Index] == '+' && (flags & Operator.AND_OPERATOR) != 0)
+ else if (state.Data[state.Index] == '+' && (m_flags & Operator.AND_OPERATOR) != 0)
{
// an and operation has been explicitly set
// if an operation has already been set this one is ignored
@@ -194,7 +194,7 @@ namespace Lucene.Net.QueryParsers.Simple
++state.Index;
}
- else if (state.Data[state.Index] == '|' && (flags & Operator.OR_OPERATOR) != 0)
+ else if (state.Data[state.Index] == '|' && (m_flags & Operator.OR_OPERATOR) != 0)
{
// an or operation has been explicitly set
// if an operation has already been set this one is ignored
@@ -208,7 +208,7 @@ namespace Lucene.Net.QueryParsers.Simple
++state.Index;
}
- else if (state.Data[state.Index] == '-' && (flags & Operator.NOT_OPERATOR) != 0)
+ else if (state.Data[state.Index] == '-' && (m_flags & Operator.NOT_OPERATOR) != 0)
{
// a not operator has been found, so increase the not count
// two not operators in a row negate each other
@@ -222,7 +222,7 @@ namespace Lucene.Net.QueryParsers.Simple
else if ((state.Data[state.Index] == ' '
|| state.Data[state.Index] == '\t'
|| state.Data[state.Index] == '\n'
- || state.Data[state.Index] == '\r') && (flags & Operator.WHITESPACE_OPERATOR) != 0)
+ || state.Data[state.Index] == '\r') && (m_flags & Operator.WHITESPACE_OPERATOR) != 0)
{
// ignore any whitespace found as it may have already been
// used a delimiter across a term (or phrase or subquery)
@@ -243,7 +243,7 @@ namespace Lucene.Net.QueryParsers.Simple
private void ConsumeSubQuery(State state)
{
- Debug.Assert((flags & Operator.PRECEDENCE_OPERATORS) != 0);
+ Debug.Assert((m_flags & Operator.PRECEDENCE_OPERATORS) != 0);
int start = ++state.Index;
int precedence = 1;
bool escaped = false;
@@ -252,7 +252,7 @@ namespace Lucene.Net.QueryParsers.Simple
{
if (!escaped)
{
- if (state.Data[state.Index] == '\\' && (flags & Operator.ESCAPE_OPERATOR) != 0)
+ if (state.Data[state.Index] == '\\' && (m_flags & Operator.ESCAPE_OPERATOR) != 0)
{
// an escape character has been found so
// whatever character is next will become
@@ -316,7 +316,7 @@ namespace Lucene.Net.QueryParsers.Simple
private void ConsumePhrase(State state)
{
- Debug.Assert((flags & Operator.PHRASE_OPERATOR) != 0);
+ Debug.Assert((m_flags & Operator.PHRASE_OPERATOR) != 0);
int start = ++state.Index;
int copied = 0;
bool escaped = false;
@@ -326,7 +326,7 @@ namespace Lucene.Net.QueryParsers.Simple
{
if (!escaped)
{
- if (state.Data[state.Index] == '\\' && (flags & Operator.ESCAPE_OPERATOR) != 0)
+ if (state.Data[state.Index] == '\\' && (m_flags & Operator.ESCAPE_OPERATOR) != 0)
{
// an escape character has been found so
// whatever character is next will become
@@ -343,7 +343,7 @@ namespace Lucene.Net.QueryParsers.Simple
// tilde
if (state.Length > (state.Index + 1) &&
state.Data[state.Index + 1] == '~' &&
- (flags & Operator.NEAR_OPERATOR) != 0)
+ (m_flags & Operator.NEAR_OPERATOR) != 0)
{
state.Index++;
// check for characters after the tilde
@@ -413,7 +413,7 @@ namespace Lucene.Net.QueryParsers.Simple
{
if (!escaped)
{
- if (state.Data[state.Index] == '\\' && (flags & Operator.ESCAPE_OPERATOR) != 0)
+ if (state.Data[state.Index] == '\\' && (m_flags & Operator.ESCAPE_OPERATOR) != 0)
{
// an escape character has been found so
// whatever character is next will become
@@ -432,7 +432,7 @@ namespace Lucene.Net.QueryParsers.Simple
// creating the term query
break;
}
- else if (copied > 0 && state.Data[state.Index] == '~' && (flags & Operator.FUZZY_OPERATOR) != 0)
+ else if (copied > 0 && state.Data[state.Index] == '~' && (m_flags & Operator.FUZZY_OPERATOR) != 0)
{
fuzzy = true;
break;
@@ -442,7 +442,7 @@ namespace Lucene.Net.QueryParsers.Simple
// was a '*' operator that hasn't been escaped
// there must be at least one valid character before
// searching for a prefixed set of terms
- prefix = copied > 0 && state.Data[state.Index] == '*' && (flags & Operator.PREFIX_OPERATOR) != 0;
+ prefix = copied > 0 && state.Data[state.Index] == '*' && (m_flags & Operator.PREFIX_OPERATOR) != 0;
}
escaped = false;
@@ -453,7 +453,7 @@ namespace Lucene.Net.QueryParsers.Simple
{
Query branch;
- if (fuzzy && (flags & Operator.FUZZY_OPERATOR) != 0)
+ if (fuzzy && (m_flags & Operator.FUZZY_OPERATOR) != 0)
{
string token = new string(state.Buffer, 0, copied);
int fuzziness = ParseFuzziness(state);
@@ -586,15 +586,15 @@ namespace Lucene.Net.QueryParsers.Simple
/// </summary>
private bool TokenFinished(State state)
{
- if ((state.Data[state.Index] == '"' && (flags & Operator.PHRASE_OPERATOR) != 0)
- || (state.Data[state.Index] == '|' && (flags & Operator.OR_OPERATOR) != 0)
- || (state.Data[state.Index] == '+' && (flags & Operator.AND_OPERATOR) != 0)
- || (state.Data[state.Index] == '(' && (flags & Operator.PRECEDENCE_OPERATORS) != 0)
- || (state.Data[state.Index] == ')' && (flags & Operator.PRECEDENCE_OPERATORS) != 0)
+ if ((state.Data[state.Index] == '"' && (m_flags & Operator.PHRASE_OPERATOR) != 0)
+ || (state.Data[state.Index] == '|' && (m_flags & Operator.OR_OPERATOR) != 0)
+ || (state.Data[state.Index] == '+' && (m_flags & Operator.AND_OPERATOR) != 0)
+ || (state.Data[state.Index] == '(' && (m_flags & Operator.PRECEDENCE_OPERATORS) != 0)
+ || (state.Data[state.Index] == ')' && (m_flags & Operator.PRECEDENCE_OPERATORS) != 0)
|| ((state.Data[state.Index] == ' '
|| state.Data[state.Index] == '\t'
|| state.Data[state.Index] == '\n'
- || state.Data[state.Index] == '\r') && (flags & Operator.WHITESPACE_OPERATOR) != 0))
+ || state.Data[state.Index] == '\r') && (m_flags & Operator.WHITESPACE_OPERATOR) != 0))
{
return true;
}
@@ -607,7 +607,7 @@ namespace Lucene.Net.QueryParsers.Simple
protected virtual Query NewDefaultQuery(string text)
{
BooleanQuery bq = new BooleanQuery(true);
- foreach (var entry in weights)
+ foreach (var entry in m_weights)
{
Query q = CreateBooleanQuery(entry.Key, text, defaultOperator);
if (q != null)
@@ -625,7 +625,7 @@ namespace Lucene.Net.QueryParsers.Simple
protected virtual Query NewFuzzyQuery(string text, int fuzziness)
{
BooleanQuery bq = new BooleanQuery(true);
- foreach (var entry in weights)
+ foreach (var entry in m_weights)
{
Query q = new FuzzyQuery(new Term(entry.Key, text), fuzziness);
if (q != null)
@@ -643,7 +643,7 @@ namespace Lucene.Net.QueryParsers.Simple
protected virtual Query NewPhraseQuery(string text, int slop)
{
BooleanQuery bq = new BooleanQuery(true);
- foreach (var entry in weights)
+ foreach (var entry in m_weights)
{
Query q = CreatePhraseQuery(entry.Key, text, slop);
if (q != null)
@@ -661,7 +661,7 @@ namespace Lucene.Net.QueryParsers.Simple
protected virtual Query NewPrefixQuery(string text)
{
BooleanQuery bq = new BooleanQuery(true);
- foreach (var entry in weights)
+ foreach (var entry in m_weights)
{
PrefixQuery prefix = new PrefixQuery(new Term(entry.Key, text));
prefix.Boost = entry.Value;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/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 b83813b..58fcbbf 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
private int jjMoveStringLiteralDfa0_1()
{
- switch (curChar)
+ switch (m_curChar)
{
case (char)40:
return JjStopAtPos(0, 13);
@@ -86,9 +86,9 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
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])
@@ -105,11 +105,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
if (kind > 7)
kind = 7;
}
- else if (curChar == 34)
+ else if (m_curChar == 34)
JjCheckNAddStates(5, 7);
if ((0x3fc000000000000L & l) != 0L)
JjCheckNAddStates(8, 11);
- else if (curChar == 49)
+ else if (m_curChar == 49)
JjCheckNAddTwoStates(20, 21);
break;
case 19:
@@ -125,11 +125,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjCheckNAdd(18);
break;
case 22:
- if (curChar == 49)
+ if (m_curChar == 49)
JjCheckNAddTwoStates(20, 21);
break;
case 23:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(5, 7);
break;
case 24:
@@ -137,11 +137,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjCheckNAddTwoStates(24, 25);
break;
case 25:
- if (curChar == 34)
+ if (m_curChar == 34)
jjstateSet[jjnewStateCnt++] = 26;
break;
case 26:
- if (curChar == 42 && kind > 18)
+ if (m_curChar == 42 && kind > 18)
kind = 18;
break;
case 27:
@@ -149,11 +149,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjCheckNAddStates(12, 14);
break;
case 29:
- if (curChar == 34)
+ if (m_curChar == 34)
JjCheckNAddStates(12, 14);
break;
case 30:
- if (curChar == 34 && kind > 19)
+ if (m_curChar == 34 && kind > 19)
kind = 19;
break;
case 31:
@@ -168,7 +168,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjCheckNAddTwoStates(32, 33);
break;
case 33:
- if (curChar == 42 && kind > 20)
+ if (m_curChar == 42 && kind > 20)
kind = 20;
break;
case 34:
@@ -200,12 +200,12 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
} while (i != startsAt);
}
- else if (curChar < 128)
+ else if (m_curChar < 128)
{
// NOTE: See the note in the Classic.QueryParserTokenManager.cs file.
// I am working under the assumption 63 is the correct value, since it
// made the tests pass there.
- ulong l = (ulong)(1L << (curChar & 63));
+ ulong l = (ulong)(1L << (m_curChar & 63));
//long l = 1L << (curChar & 077);
do
{
@@ -228,81 +228,81 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
if (kind > 11)
kind = 11;
}
- else if (curChar == 97)
+ else if (m_curChar == 97)
jjstateSet[jjnewStateCnt++] = 9;
- else if (curChar == 65)
+ else if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 6;
- else if (curChar == 111)
+ else if (m_curChar == 111)
jjstateSet[jjnewStateCnt++] = 3;
- else if (curChar == 79)
+ else if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 1;
- if (curChar == 110)
+ if (m_curChar == 110)
jjstateSet[jjnewStateCnt++] = 15;
- else if (curChar == 78)
+ else if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 12;
break;
case 1:
- if (curChar == 82 && kind > 8)
+ if (m_curChar == 82 && kind > 8)
kind = 8;
break;
case 2:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 1;
break;
case 3:
- if (curChar == 114 && kind > 8)
+ if (m_curChar == 114 && kind > 8)
kind = 8;
break;
case 4:
- if (curChar == 111)
+ if (m_curChar == 111)
jjstateSet[jjnewStateCnt++] = 3;
break;
case 5:
- if (curChar == 68 && kind > 9)
+ if (m_curChar == 68 && kind > 9)
kind = 9;
break;
case 6:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 5;
break;
case 7:
- if (curChar == 65)
+ if (m_curChar == 65)
jjstateSet[jjnewStateCnt++] = 6;
break;
case 8:
- if (curChar == 100 && kind > 9)
+ if (m_curChar == 100 && kind > 9)
kind = 9;
break;
case 9:
- if (curChar == 110)
+ if (m_curChar == 110)
jjstateSet[jjnewStateCnt++] = 8;
break;
case 10:
- if (curChar == 97)
+ if (m_curChar == 97)
jjstateSet[jjnewStateCnt++] = 9;
break;
case 11:
- if (curChar == 84 && kind > 10)
+ if (m_curChar == 84 && kind > 10)
kind = 10;
break;
case 12:
- if (curChar == 79)
+ if (m_curChar == 79)
jjstateSet[jjnewStateCnt++] = 11;
break;
case 13:
- if (curChar == 78)
+ if (m_curChar == 78)
jjstateSet[jjnewStateCnt++] = 12;
break;
case 14:
- if (curChar == 116 && kind > 10)
+ if (m_curChar == 116 && kind > 10)
kind = 10;
break;
case 15:
- if (curChar == 111)
+ if (m_curChar == 111)
jjstateSet[jjnewStateCnt++] = 14;
break;
case 16:
- if (curChar == 110)
+ if (m_curChar == 110)
jjstateSet[jjnewStateCnt++] = 15;
break;
case 17:
@@ -321,11 +321,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjCheckNAddStates(12, 14);
break;
case 28:
- if (curChar == 92)
+ if (m_curChar == 92)
jjstateSet[jjnewStateCnt++] = 29;
break;
case 29:
- if (curChar == 92)
+ if (m_curChar == 92)
JjCheckNAddStates(12, 14);
break;
case 31:
@@ -363,13 +363,13 @@ namespace Lucene.Net.QueryParsers.Surround.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])
@@ -424,7 +424,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
++curPos;
if ((i = jjnewStateCnt) == (startsAt = 38 - (jjnewStateCnt = startsAt)))
return curPos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
catch (System.IO.IOException /*e*/) { return curPos; }
}
}
@@ -444,9 +444,9 @@ namespace Lucene.Net.QueryParsers.Surround.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])
@@ -459,7 +459,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
JjAddStates(17, 18);
break;
case 1:
- if (curChar == 46)
+ if (m_curChar == 46)
JjCheckNAdd(2);
break;
case 2:
@@ -473,10 +473,10 @@ namespace Lucene.Net.QueryParsers.Surround.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])
@@ -487,13 +487,13 @@ namespace Lucene.Net.QueryParsers.Surround.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])
@@ -511,7 +511,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
++curPos;
if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
return curPos;
- try { curChar = input_stream.ReadChar(); }
+ try { m_curChar = m_input_stream.ReadChar(); }
catch (System.IO.IOException /*e*/) { return curPos; }
}
}
@@ -560,15 +560,15 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
internal static readonly long[] jjtoSkip = {
0x80L,
};
- protected ICharStream input_stream;
+ protected ICharStream m_input_stream;
private readonly uint[] jjrounds = new uint[38];
private readonly int[] jjstateSet = new int[76];
- protected internal char curChar;
+ protected char m_curChar;
/// <summary>Constructor.</summary>
public QueryParserTokenManager(ICharStream stream)
{
- input_stream = stream;
+ m_input_stream = stream;
}
/// <summary>Constructor.</summary>
@@ -583,7 +583,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
jjmatchedPos = jjnewStateCnt = 0;
curLexState = defaultLexState;
- input_stream = stream;
+ m_input_stream = stream;
ReInitRounds();
}
private void ReInitRounds()
@@ -619,11 +619,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
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;
@@ -652,7 +652,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
try
{
- curChar = input_stream.BeginToken();
+ m_curChar = m_input_stream.BeginToken();
}
catch (System.IO.IOException /*e*/)
{
@@ -677,7 +677,7 @@ namespace Lucene.Net.QueryParsers.Surround.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();
@@ -692,16 +692,16 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
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); }
+ try { m_input_stream.ReadChar(); m_input_stream.BackUp(1); }
catch (System.IO.IOException /*e1*/)
{
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;
@@ -711,10 +711,10 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
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/Surround/Query/ComposedQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
index aff2dee..e35780d 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/ComposedQuery.cs
@@ -31,28 +31,28 @@ namespace Lucene.Net.QueryParsers.Surround.Query
{
Recompose(qs);
this.operatorInfix = operatorInfix;
- this.opName = opName;
+ this.m_opName = opName;
}
protected virtual void Recompose(IEnumerable<SrndQuery> queries)
{
if (queries.Count() < 2) throw new InvalidOperationException("Too few subqueries");
- this.queries = new List<SrndQuery>(queries);
+ this.m_queries = new List<SrndQuery>(queries);
}
- protected string opName;
- public virtual string OperatorName { get { return opName; } }
+ protected string m_opName;
+ public virtual string OperatorName { get { return m_opName; } }
- protected IList<SrndQuery> queries;
+ protected IList<SrndQuery> m_queries;
public virtual IEnumerator<SrndQuery> GetSubQueriesEnumerator()
{
- return queries.GetEnumerator();
+ return m_queries.GetEnumerator();
}
- public virtual int NrSubQueries { get { return queries.Count; } }
+ public virtual int NrSubQueries { get { return m_queries.Count; } }
- public virtual SrndQuery GetSubQuery(int qn) { return queries[qn]; }
+ public virtual SrndQuery GetSubQuery(int qn) { return m_queries[qn]; }
private bool operatorInfix;
public virtual bool IsOperatorInfix { get { return operatorInfix; } } /* else prefix operator */
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Surround/Query/DistanceRewriteQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/DistanceRewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/DistanceRewriteQuery.cs
index d888483..569a710 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/DistanceRewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/DistanceRewriteQuery.cs
@@ -29,7 +29,7 @@
public override Search.Query Rewrite(Index.IndexReader reader)
{
- return srndQuery.GetSpanNearQuery(reader, fieldName, Boost, qf);
+ return m_srndQuery.GetSpanNearQuery(reader, m_fieldName, Boost, m_qf);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
index 7c0ade0..b2d3c5b 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/RewriteQuery.cs
@@ -22,18 +22,18 @@ namespace Lucene.Net.QueryParsers.Surround.Query
internal abstract class RewriteQuery<SQ> : Search.Query
{
- protected readonly SQ srndQuery;
- protected readonly string fieldName;
- protected readonly BasicQueryFactory qf;
+ protected readonly SQ m_srndQuery;
+ protected readonly string m_fieldName;
+ protected readonly BasicQueryFactory m_qf;
public RewriteQuery(
SQ srndQuery,
string fieldName,
BasicQueryFactory qf)
{
- this.srndQuery = srndQuery;
- this.fieldName = fieldName;
- this.qf = qf;
+ this.m_srndQuery = srndQuery;
+ this.m_fieldName = fieldName;
+ this.m_qf = qf;
}
public abstract override Search.Query Rewrite(IndexReader reader);
@@ -47,18 +47,18 @@ namespace Lucene.Net.QueryParsers.Surround.Query
{
return GetType().Name
+ (field == null ? "" : "(unused: " + field + ")")
- + "(" + fieldName
- + ", " + srndQuery.ToString()
- + ", " + qf.ToString()
+ + "(" + m_fieldName
+ + ", " + m_srndQuery.ToString()
+ + ", " + m_qf.ToString()
+ ")";
}
public override int GetHashCode()
{
return GetType().GetHashCode()
- ^ fieldName.GetHashCode()
- ^ qf.GetHashCode()
- ^ srndQuery.GetHashCode();
+ ^ m_fieldName.GetHashCode()
+ ^ m_qf.GetHashCode()
+ ^ m_srndQuery.GetHashCode();
}
public override bool Equals(object obj)
@@ -68,9 +68,9 @@ namespace Lucene.Net.QueryParsers.Surround.Query
if (!GetType().Equals(obj.GetType()))
return false;
RewriteQuery<SQ> other = (RewriteQuery<SQ>)obj;
- return fieldName.Equals(other.fieldName)
- && qf.Equals(other.qf)
- && srndQuery.Equals(other.srndQuery);
+ return m_fieldName.Equals(other.m_fieldName)
+ && m_qf.Equals(other.m_qf)
+ && m_srndQuery.Equals(other.m_srndQuery);
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
index 9d251fe..a73434c 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/SimpleTermRewriteQuery.cs
@@ -35,8 +35,8 @@ namespace Lucene.Net.QueryParsers.Surround.Query
public override Search.Query Rewrite(IndexReader reader)
{
var luceneSubQueries = new List<Search.Query>();
- srndQuery.VisitMatchingTerms(reader, fieldName,
- new SimpleTermRewriteMatchingTermVisitor(luceneSubQueries, qf));
+ m_srndQuery.VisitMatchingTerms(reader, m_fieldName,
+ new SimpleTermRewriteMatchingTermVisitor(luceneSubQueries, m_qf));
return (luceneSubQueries.Count == 0) ? SrndQuery.TheEmptyLcnQuery
: (luceneSubQueries.Count == 1) ? luceneSubQueries.First()
: SrndBooleanQuery.MakeBooleanQuery(
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Xml/CoreParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/CoreParser.cs b/src/Lucene.Net.QueryParser/Xml/CoreParser.cs
index 5430fec..dfc6859 100644
--- a/src/Lucene.Net.QueryParser/Xml/CoreParser.cs
+++ b/src/Lucene.Net.QueryParser/Xml/CoreParser.cs
@@ -30,10 +30,10 @@ namespace Lucene.Net.QueryParsers.Xml
/// </summary>
public class CoreParser : IQueryBuilder
{
- protected Analyzer analyzer;
- protected QueryParser parser;
- protected QueryBuilderFactory queryFactory;
- protected FilterBuilderFactory filterFactory;
+ protected Analyzer m_analyzer;
+ protected QueryParser m_parser;
+ protected QueryBuilderFactory m_queryFactory;
+ protected FilterBuilderFactory m_filterFactory;
//Controls the max size of the LRU cache used for QueryFilter objects parsed.
public static int maxNumCachedFilters = 20;
@@ -60,62 +60,62 @@ namespace Lucene.Net.QueryParsers.Xml
protected CoreParser(string defaultField, Analyzer analyzer, QueryParser parser)
{
- this.analyzer = analyzer;
- this.parser = parser;
- filterFactory = new FilterBuilderFactory();
- filterFactory.AddBuilder("RangeFilter", new RangeFilterBuilder());
- filterFactory.AddBuilder("NumericRangeFilter", new NumericRangeFilterBuilder());
-
- queryFactory = new QueryBuilderFactory();
- queryFactory.AddBuilder("TermQuery", new TermQueryBuilder());
- queryFactory.AddBuilder("TermsQuery", new TermsQueryBuilder(analyzer));
- queryFactory.AddBuilder("MatchAllDocsQuery", new MatchAllDocsQueryBuilder());
- queryFactory.AddBuilder("BooleanQuery", new BooleanQueryBuilder(queryFactory));
- queryFactory.AddBuilder("NumericRangeQuery", new NumericRangeQueryBuilder());
- queryFactory.AddBuilder("DisjunctionMaxQuery", new DisjunctionMaxQueryBuilder(queryFactory));
+ this.m_analyzer = analyzer;
+ this.m_parser = parser;
+ m_filterFactory = new FilterBuilderFactory();
+ m_filterFactory.AddBuilder("RangeFilter", new RangeFilterBuilder());
+ m_filterFactory.AddBuilder("NumericRangeFilter", new NumericRangeFilterBuilder());
+
+ m_queryFactory = new QueryBuilderFactory();
+ m_queryFactory.AddBuilder("TermQuery", new TermQueryBuilder());
+ m_queryFactory.AddBuilder("TermsQuery", new TermsQueryBuilder(analyzer));
+ m_queryFactory.AddBuilder("MatchAllDocsQuery", new MatchAllDocsQueryBuilder());
+ m_queryFactory.AddBuilder("BooleanQuery", new BooleanQueryBuilder(m_queryFactory));
+ m_queryFactory.AddBuilder("NumericRangeQuery", new NumericRangeQueryBuilder());
+ m_queryFactory.AddBuilder("DisjunctionMaxQuery", new DisjunctionMaxQueryBuilder(m_queryFactory));
if (parser != null)
{
- queryFactory.AddBuilder("UserQuery", new UserInputQueryBuilder(parser));
+ m_queryFactory.AddBuilder("UserQuery", new UserInputQueryBuilder(parser));
}
else
{
- queryFactory.AddBuilder("UserQuery", new UserInputQueryBuilder(defaultField, analyzer));
+ m_queryFactory.AddBuilder("UserQuery", new UserInputQueryBuilder(defaultField, analyzer));
}
- queryFactory.AddBuilder("FilteredQuery", new FilteredQueryBuilder(filterFactory, queryFactory));
- queryFactory.AddBuilder("ConstantScoreQuery", new ConstantScoreQueryBuilder(filterFactory));
+ m_queryFactory.AddBuilder("FilteredQuery", new FilteredQueryBuilder(m_filterFactory, m_queryFactory));
+ m_queryFactory.AddBuilder("ConstantScoreQuery", new ConstantScoreQueryBuilder(m_filterFactory));
- filterFactory.AddBuilder("CachedFilter", new CachedFilterBuilder(queryFactory,
- filterFactory, maxNumCachedFilters));
+ m_filterFactory.AddBuilder("CachedFilter", new CachedFilterBuilder(m_queryFactory,
+ m_filterFactory, maxNumCachedFilters));
SpanQueryBuilderFactory sqof = new SpanQueryBuilderFactory();
SpanNearBuilder snb = new SpanNearBuilder(sqof);
sqof.AddBuilder("SpanNear", snb);
- queryFactory.AddBuilder("SpanNear", snb);
+ m_queryFactory.AddBuilder("SpanNear", snb);
BoostingTermBuilder btb = new BoostingTermBuilder();
sqof.AddBuilder("BoostingTermQuery", btb);
- queryFactory.AddBuilder("BoostingTermQuery", btb);
+ m_queryFactory.AddBuilder("BoostingTermQuery", btb);
SpanTermBuilder snt = new SpanTermBuilder();
sqof.AddBuilder("SpanTerm", snt);
- queryFactory.AddBuilder("SpanTerm", snt);
+ m_queryFactory.AddBuilder("SpanTerm", snt);
SpanOrBuilder sot = new SpanOrBuilder(sqof);
sqof.AddBuilder("SpanOr", sot);
- queryFactory.AddBuilder("SpanOr", sot);
+ m_queryFactory.AddBuilder("SpanOr", sot);
SpanOrTermsBuilder sots = new SpanOrTermsBuilder(analyzer);
sqof.AddBuilder("SpanOrTerms", sots);
- queryFactory.AddBuilder("SpanOrTerms", sots);
+ m_queryFactory.AddBuilder("SpanOrTerms", sots);
SpanFirstBuilder sft = new SpanFirstBuilder(sqof);
sqof.AddBuilder("SpanFirst", sft);
- queryFactory.AddBuilder("SpanFirst", sft);
+ m_queryFactory.AddBuilder("SpanFirst", sft);
SpanNotBuilder snot = new SpanNotBuilder(sqof);
sqof.AddBuilder("SpanNot", snot);
- queryFactory.AddBuilder("SpanNot", snot);
+ m_queryFactory.AddBuilder("SpanNot", snot);
}
public virtual Query Parse(Stream xmlStream)
@@ -143,12 +143,12 @@ namespace Lucene.Net.QueryParsers.Xml
public virtual void AddQueryBuilder(string nodeName, IQueryBuilder builder)
{
- queryFactory.AddBuilder(nodeName, builder);
+ m_queryFactory.AddBuilder(nodeName, builder);
}
public virtual void AddFilterBuilder(string nodeName, IFilterBuilder builder)
{
- filterFactory.AddBuilder(nodeName, builder);
+ m_filterFactory.AddBuilder(nodeName, builder);
}
private static XmlDocument ParseXML(Stream pXmlFile)
@@ -197,7 +197,7 @@ namespace Lucene.Net.QueryParsers.Xml
public virtual Query GetQuery(XmlElement e)
{
- return queryFactory.GetQuery(e);
+ return m_queryFactory.GetQuery(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b170b54b/src/Lucene.Net.QueryParser/Xml/CorePlusExtensionsParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Xml/CorePlusExtensionsParser.cs b/src/Lucene.Net.QueryParser/Xml/CorePlusExtensionsParser.cs
index 4c6b77f..231d52e 100644
--- a/src/Lucene.Net.QueryParser/Xml/CorePlusExtensionsParser.cs
+++ b/src/Lucene.Net.QueryParser/Xml/CorePlusExtensionsParser.cs
@@ -52,13 +52,13 @@ namespace Lucene.Net.QueryParsers.Xml
private CorePlusExtensionsParser(string defaultField, Analyzer analyzer, QueryParser parser)
: base(defaultField, analyzer, parser)
{
- filterFactory.AddBuilder("TermsFilter", new TermsFilterBuilder(analyzer));
- filterFactory.AddBuilder("BooleanFilter", new BooleanFilterBuilder(filterFactory));
- filterFactory.AddBuilder("DuplicateFilter", new DuplicateFilterBuilder());
+ m_filterFactory.AddBuilder("TermsFilter", new TermsFilterBuilder(analyzer));
+ m_filterFactory.AddBuilder("BooleanFilter", new BooleanFilterBuilder(m_filterFactory));
+ m_filterFactory.AddBuilder("DuplicateFilter", new DuplicateFilterBuilder());
string[] fields = { "contents" };
- queryFactory.AddBuilder("LikeThisQuery", new LikeThisQueryBuilder(analyzer, fields));
- queryFactory.AddBuilder("BoostingQuery", new BoostingQueryBuilder(queryFactory));
- queryFactory.AddBuilder("FuzzyLikeThisQuery", new FuzzyLikeThisQueryBuilder(analyzer));
+ m_queryFactory.AddBuilder("LikeThisQuery", new LikeThisQueryBuilder(analyzer, fields));
+ m_queryFactory.AddBuilder("BoostingQuery", new BoostingQueryBuilder(m_queryFactory));
+ m_queryFactory.AddBuilder("FuzzyLikeThisQuery", new FuzzyLikeThisQueryBuilder(analyzer));
}
}
}
[03/15] lucenenet git commit:
Lucene.Net.Sandbox.Queries.FuzzyLikeThisQuery.ScoreTerm refactor: made public
fields into auto-implemented properties
Posted by ni...@apache.org.
Lucene.Net.Sandbox.Queries.FuzzyLikeThisQuery.ScoreTerm refactor: made public fields into auto-implemented properties
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/03d13870
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/03d13870
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/03d13870
Branch: refs/heads/api-work
Commit: 03d138703ae080be1bfda845c4f3a470c81ca067
Parents: 2bf7b0a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:49:34 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:49:34 2017 +0700
----------------------------------------------------------------------
.../Queries/FuzzyLikeThisQuery.cs | 34 ++++++++++----------
1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/03d13870/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
index beca1a0..48c2b3e 100644
--- a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
+++ b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
@@ -235,7 +235,7 @@ namespace Lucene.Net.Sandbox.Queries
{
ScoreTerm st = new ScoreTerm(new Term(startTerm.Field, BytesRef.DeepCopyOf(possibleMatch)), score, startTerm);
variantsQ.InsertWithOverflow(st);
- minScore = variantsQ.Top.score; // maintain minScore
+ minScore = variantsQ.Top.Score; // maintain minScore
}
maxBoostAtt.MaxNonCompetitiveBoost = variantsQ.Count >= MAX_VARIANTS_PER_TERM ? minScore : float.NegativeInfinity;
}
@@ -255,7 +255,7 @@ namespace Lucene.Net.Sandbox.Queries
for (int i = 0; i < size; i++)
{
ScoreTerm st = variantsQ.Pop();
- st.score = (st.score * st.score) * sim.Idf(df, corpusNumDocs);
+ st.Score = (st.Score * st.Score) * sim.Idf(df, corpusNumDocs);
q.InsertWithOverflow(st);
}
}
@@ -298,10 +298,10 @@ namespace Lucene.Net.Sandbox.Queries
//List<ScoreTerm> l = variantQueries.get(st.fuzziedSourceTerm);
// if(l==null)
List<ScoreTerm> l;
- if (!variantQueries.TryGetValue(st.fuzziedSourceTerm, out l) || l == null)
+ if (!variantQueries.TryGetValue(st.FuzziedSourceTerm, out l) || l == null)
{
l = new List<ScoreTerm>();
- variantQueries[st.fuzziedSourceTerm] = l;
+ variantQueries[st.FuzziedSourceTerm] = l;
}
l.Add(st);
}
@@ -313,8 +313,8 @@ namespace Lucene.Net.Sandbox.Queries
{
//optimize where only one selected variant
ScoreTerm st = variants[0];
- Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.term)) : new TermQuery(st.term, 1);
- tq.Boost = st.score; // set the boost to a mix of IDF and score
+ Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.Term)) : new TermQuery(st.Term, 1);
+ tq.Boost = st.Score; // set the boost to a mix of IDF and score
bq.Add(tq, Occur.SHOULD);
}
else
@@ -325,8 +325,8 @@ namespace Lucene.Net.Sandbox.Queries
{
ScoreTerm st = iterator2.Current;
// found a match
- Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.term)) : new TermQuery(st.term, 1);
- tq.Boost = st.score; // set the boost using the ScoreTerm's score
+ Query tq = ignoreTF ? (Query)new ConstantScoreQuery(new TermQuery(st.Term)) : new TermQuery(st.Term, 1);
+ tq.Boost = st.Score; // set the boost using the ScoreTerm's score
termVariants.Add(tq, Occur.SHOULD); // add to query
}
bq.Add(termVariants, Occur.SHOULD); // add to query
@@ -344,15 +344,15 @@ namespace Lucene.Net.Sandbox.Queries
// terms/fields
internal class ScoreTerm
{
- public Term term;
- public float score;
- internal Term fuzziedSourceTerm;
+ public Term Term { get; set; }
+ public float Score { get; set; }
+ internal Term FuzziedSourceTerm { get; set; }
public ScoreTerm(Term term, float score, Term fuzziedSourceTerm)
{
- this.term = term;
- this.score = score;
- this.fuzziedSourceTerm = fuzziedSourceTerm;
+ this.Term = term;
+ this.Score = score;
+ this.FuzziedSourceTerm = fuzziedSourceTerm;
}
}
@@ -369,10 +369,10 @@ namespace Lucene.Net.Sandbox.Queries
/// </summary>
protected override bool LessThan(ScoreTerm termA, ScoreTerm termB)
{
- if (termA.score == termB.score)
- return termA.term.CompareTo(termB.term) > 0;
+ if (termA.Score == termB.Score)
+ return termA.Term.CompareTo(termB.Term) > 0;
else
- return termA.score < termB.score;
+ return termA.Score < termB.Score;
}
}
[04/15] lucenenet git commit: Lucene.Net.Tests.QueryParser: Added API
consistency tests
Posted by ni...@apache.org.
Lucene.Net.Tests.QueryParser: Added API consistency tests
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b1efc526
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b1efc526
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b1efc526
Branch: refs/heads/api-work
Commit: b1efc52626bfe182de0441fb3a45c524ff14acad
Parents: 03d1387
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:52:52 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:52:52 2017 +0700
----------------------------------------------------------------------
.../Lucene.Net.Tests.QueryParser.csproj | 1 +
.../TestApiConsistency.cs | 120 +++++++++++++++++++
2 files changed, 121 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b1efc526/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
index 61c0e43..b19c814 100644
--- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
+++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj
@@ -82,6 +82,7 @@
<Compile Include="Surround\Query\Test01Exceptions.cs" />
<Compile Include="Surround\Query\Test02Boolean.cs" />
<Compile Include="Surround\Query\Test03Distance.cs" />
+ <Compile Include="TestApiConsistency.cs" />
<Compile Include="Util\QueryParserTestBase.cs" />
<Compile Include="Xml\Builders\TestNumericRangeFilterBuilder.cs" />
<Compile Include="Xml\Builders\TestNumericRangeQueryBuilder.cs" />
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b1efc526/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs b/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
new file mode 100644
index 0000000..b28ace3
--- /dev/null
+++ b/src/Lucene.Net.Tests.QueryParser/TestApiConsistency.cs
@@ -0,0 +1,120 @@
+\ufeffusing Lucene.Net.Attributes;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System;
+
+namespace Lucene.Net.QueryParsers
+{
+ /// <summary>
+ /// LUCENENET specific tests for ensuring API conventions are followed
+ /// </summary>
+ public class TestApiConsistency : ApiScanTestBase
+ {
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestProtectedFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestProtectedFieldNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestPrivateFieldNames(Type typeFromTargetAssembly)
+ {
+ base.TestPrivateFieldNames(typeFromTargetAssembly, @"Snowball\.Ext\..+Stemmer");
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestPublicFields(Type typeFromTargetAssembly)
+ {
+ base.TestPublicFields(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestMethodParameterNames(Type typeFromTargetAssembly)
+ {
+ base.TestMethodParameterNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestInterfaceNames(Type typeFromTargetAssembly)
+ {
+ base.TestInterfaceNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestClassNames(Type typeFromTargetAssembly)
+ {
+ base.TestClassNames(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPropertiesWithNoGetter(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesWithNoGetter(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPropertiesThatReturnArray(Type typeFromTargetAssembly)
+ {
+ base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForMethodsThatReturnWritableArray(Type typeFromTargetAssembly)
+ {
+ base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPublicMembersContainingComparer(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingComparer(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPublicMembersNamedSize(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersNamedSize(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPublicMembersContainingNonNetNumeric(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersContainingNonNetNumeric(typeFromTargetAssembly);
+ }
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForPublicMembersWithNullableEnum(Type typeFromTargetAssembly)
+ {
+ base.TestForPublicMembersWithNullableEnum(typeFromTargetAssembly);
+ }
+
+ // LUCENENET NOTE: This test is only for identifying members who were changed from
+ // ICollection, IList or ISet to IEnumerable during the port (that should be changed back)
+ //[Test, LuceneNetSpecific]
+ //[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ //public override void TestForMembersAcceptingOrReturningIEnumerable(Type typeFromTargetAssembly)
+ //{
+ // base.TestForMembersAcceptingOrReturningIEnumerable(typeFromTargetAssembly);
+ //}
+
+ [Test, LuceneNetSpecific]
+ [TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
+ public override void TestForMembersAcceptingOrReturningListOrDictionary(Type typeFromTargetAssembly)
+ {
+ base.TestForMembersAcceptingOrReturningListOrDictionary(typeFromTargetAssembly);
+ }
+ }
+}
[14/15] lucenenet git commit:
Lucene.Net.QueryParser.Flexible.Standard.StandardQueryParser.DefaultOperator
refactor: changed to be non-nullable enum,
and set the default value to OR by specifying its value as 0
Posted by ni...@apache.org.
Lucene.Net.QueryParser.Flexible.Standard.StandardQueryParser.DefaultOperator refactor: changed to be non-nullable enum, and set the default value to OR by specifying its value as 0
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a007beca
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a007beca
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a007beca
Branch: refs/heads/api-work
Commit: a007becac5fd8786a461e476306a6932284d907a
Parents: 13db3e6
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 12:11:10 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 12:11:10 2017 +0700
----------------------------------------------------------------------
.../Flexible/Standard/Config/StandardQueryConfigHandler.cs | 6 +++---
.../Standard/Processors/AnalyzerQueryNodeProcessor.cs | 8 ++++++--
.../Flexible/Standard/StandardQueryParser.cs | 2 +-
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a007beca/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
index f526f36..db5b39f 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Config/StandardQueryConfigHandler.cs
@@ -62,8 +62,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
/// </summary>
public enum Operator
{
- AND,
- OR
+ AND = 1,
+ OR = 0 // LUCENENET: Default value if not set
}
}
@@ -100,7 +100,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Config
/// Key used to set the default boolean operator
/// </summary>
/// <seealso cref="StandardQueryParser.DefaultOperator"/>
- public readonly static ConfigurationKey<Operator?> DEFAULT_OPERATOR = ConfigurationKey.NewInstance<Operator?>();
+ public readonly static ConfigurationKey<Operator> DEFAULT_OPERATOR = ConfigurationKey.NewInstance<Operator>();
/// <summary>
/// Key used to set the default phrase slop
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a007beca/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
index 15c52f8..89ce4fe 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Processors/AnalyzerQueryNodeProcessor.cs
@@ -74,8 +74,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Processors
this.analyzer = analyzer;
this.positionIncrementsEnabled = false;
bool? positionIncrementsEnabled = GetQueryConfigHandler().Get(ConfigurationKeys.ENABLE_POSITION_INCREMENTS);
- var defaultOperator = GetQueryConfigHandler().Get(ConfigurationKeys.DEFAULT_OPERATOR);
- this.defaultOperator = defaultOperator != null ? defaultOperator.Value : Operator.OR;
+
+ // LUCENENET specific - rather than using null, we are relying on the behavior that the default
+ // value for an enum is 0 (OR in this case).
+ //var defaultOperator = GetQueryConfigHandler().Get(ConfigurationKeys.DEFAULT_OPERATOR);
+ //this.defaultOperator = defaultOperator != null ? defaultOperator.Value : Operator.OR;
+ this.defaultOperator = GetQueryConfigHandler().Get(ConfigurationKeys.DEFAULT_OPERATOR);
if (positionIncrementsEnabled != null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a007beca/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs
index 48900b7..479ddb3 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/StandardQueryParser.cs
@@ -157,7 +157,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard
/// In <see cref="Operator.AND"/> mode terms are considered to be in conjunction: the
/// above mentioned query is parsed as <c>capital AND of AND Hungary</c>
/// </summary>
- public virtual Operator? DefaultOperator
+ public virtual Operator DefaultOperator
{
get { return QueryConfigHandler.Get(ConfigurationKeys.DEFAULT_OPERATOR); }
set { QueryConfigHandler.Set(ConfigurationKeys.DEFAULT_OPERATOR, value); }
[06/15] lucenenet git commit:
Lucene.Net.QueryParser.ComplexPhrase.ComplexPhraseQueryParser.ComplexPhraseQuery.AddComplexPhraseClause()
refactor: changed parameter from List to IList
Posted by ni...@apache.org.
Lucene.Net.QueryParser.ComplexPhrase.ComplexPhraseQueryParser.ComplexPhraseQuery.AddComplexPhraseClause() refactor: changed parameter from List<T> to IList<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/48d6cd54
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/48d6cd54
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/48d6cd54
Branch: refs/heads/api-work
Commit: 48d6cd54482fe518b3f89f4c412a5151ff22680f
Parents: 9f9c1a2
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:59:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:59:26 2017 +0700
----------------------------------------------------------------------
.../ComplexPhrase/ComplexPhraseQueryParser.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/48d6cd54/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 2f25390..ebf32ca 100644
--- a/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/ComplexPhrase/ComplexPhraseQueryParser.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.QueryParsers.ComplexPhrase
/// status
/// </para>
/// </summary>
- public class ComplexPhraseQueryParser : Classic.QueryParser
+ public class ComplexPhraseQueryParser : QueryParser
{
private List<ComplexPhraseQuery> complexPhrases = null;
@@ -356,7 +356,7 @@ namespace Lucene.Net.QueryParsers.ComplexPhrase
return snot;
}
- private void AddComplexPhraseClause(List<SpanQuery> spanClauses, BooleanQuery qc)
+ private void AddComplexPhraseClause(IList<SpanQuery> spanClauses, BooleanQuery qc)
{
List<SpanQuery> ors = new List<SpanQuery>();
List<SpanQuery> nots = new List<SpanQuery>();
[05/15] lucenenet git commit:
Lucene.Net.QueryParser.Flexible.Core.Processors.QueryNodeProcessorPipeline.GetRange()
refactor: changed return type from List to IList
Posted by ni...@apache.org.
Lucene.Net.QueryParser.Flexible.Core.Processors.QueryNodeProcessorPipeline.GetRange() refactor: changed return type from List<T> to IList<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/9f9c1a22
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/9f9c1a22
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/9f9c1a22
Branch: refs/heads/api-work
Commit: 9f9c1a22bc60be95f0d0b44fc871994c26de7662
Parents: b1efc52
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:56:16 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:56:16 2017 +0700
----------------------------------------------------------------------
.../Flexible/Core/Processors/QueryNodeProcessorPipeline.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/9f9c1a22/src/Lucene.Net.QueryParser/Flexible/Core/Processors/QueryNodeProcessorPipeline.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Core/Processors/QueryNodeProcessorPipeline.cs b/src/Lucene.Net.QueryParser/Flexible/Core/Processors/QueryNodeProcessorPipeline.cs
index d894c4f..39476c0 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Core/Processors/QueryNodeProcessorPipeline.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Core/Processors/QueryNodeProcessorPipeline.cs
@@ -224,7 +224,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Core.Processors
}
}
- public virtual List<IQueryNodeProcessor> GetRange(int index, int count)
+ public virtual IList<IQueryNodeProcessor> GetRange(int index, int count)
{
return this.processors.GetRange(index, count);
}
[10/15] lucenenet git commit: Lucene.Net.QueryParser refactor:
renamed all protected fields camelCase prefixed with m_
Posted by ni...@apache.org.
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: { }
}
[13/15] lucenenet git commit: Lucene.Net.QueryParser: changed public
fields into properties or marked them private. Added SafeTextWriterWrapper to
debugStreams.
Posted by ni...@apache.org.
Lucene.Net.QueryParser: changed public fields into properties or marked them private. Added SafeTextWriterWrapper to debugStreams.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/13db3e69
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/13db3e69
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/13db3e69
Branch: refs/heads/api-work
Commit: 13db3e6996be8bace00ba0b3cb35d017d4fe7cdc
Parents: 7667d56
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 11:54:56 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 11:54:56 2017 +0700
----------------------------------------------------------------------
.../Classic/ParseException.cs | 39 ++++--
.../Classic/QueryParser.cs | 88 ++++++-------
.../Classic/QueryParserBase.cs | 16 +--
.../Classic/QueryParserTokenManager.cs | 13 +-
src/Lucene.Net.QueryParser/Classic/Token.cs | 92 ++++++-------
.../Standard/Nodes/NumericRangeQueryNode.cs | 3 +-
.../Flexible/Standard/Parser/ParseException.cs | 39 ++++--
.../Standard/Parser/StandardSyntaxParser.cs | 128 +++++++++----------
.../Parser/StandardSyntaxParserTokenManager.cs | 15 ++-
.../Flexible/Standard/Parser/Token.cs | 22 ++--
.../Surround/Parser/ParseException.cs | 41 ++++--
.../Surround/Parser/QueryParser.cs | 112 ++++++++--------
.../Surround/Parser/QueryParserTokenManager.cs | 15 ++-
.../Surround/Parser/Token.cs | 98 +++++++-------
.../Classic/TestQueryParser.cs | 4 +-
15 files changed, 396 insertions(+), 329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Classic/ParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/ParseException.cs b/src/Lucene.Net.QueryParser/Classic/ParseException.cs
index 89d2a07..516497b 100644
--- a/src/Lucene.Net.QueryParser/Classic/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Classic/ParseException.cs
@@ -1,4 +1,6 @@
+using Lucene.Net.Support;
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Text;
namespace Lucene.Net.QueryParsers.Classic
@@ -77,21 +79,40 @@ namespace Lucene.Net.QueryParsers.Classic
/// this object has been created due to a parse error, the token
/// following this token will (therefore) be the first error token.
/// </summary>
- public Token currentToken;
+ public Token CurrentToken
+ {
+ get { return currentToken; }
+ set { currentToken = value; }
+ }
+ private Token currentToken;
/// <summary>
/// Each entry in this array is an array of integers. Each array
/// of integers represents a sequence of tokens (by their ordinal
/// values) that is expected at this point of the parse.
/// </summary>
- public int[][] expectedTokenSequences;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public int[][] ExpectedTokenSequences
+ {
+ get { return expectedTokenSequences; }
+ set { expectedTokenSequences = value; }
+ }
+ private int[][] expectedTokenSequences;
/// <summary>
/// This is a reference to the "tokenImage" array of the generated
/// parser within which the parse error occurred. This array is
/// defined in the generated ...Constants interface.
/// </summary>
- public string[] tokenImage;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public string[] TokenImage
+ {
+ get { return tokenImage; }
+ set { tokenImage = value; }
+ }
+ private string[] tokenImage;
/// <summary>
@@ -125,23 +146,23 @@ namespace Lucene.Net.QueryParsers.Classic
expected.Append(eol).Append(" ");
}
string retval = "Encountered \"";
- Token tok = currentToken.next;
+ Token tok = currentToken.Next;
for (int i = 0; i < maxSize; i++)
{
if (i != 0)
retval += " ";
- if (tok.kind == 0)
+ if (tok.Kind == 0)
{
retval += tokenImage[0];
break;
}
- retval += (" " + tokenImage[tok.kind]);
+ retval += (" " + tokenImage[tok.Kind]);
retval += " \"";
- retval += Add_escapes(tok.image);
+ retval += Add_escapes(tok.Image);
retval += " \"";
- tok = tok.next;
+ tok = tok.Next;
}
- retval += ("\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn);
+ retval += ("\" at line " + currentToken.Next.BeginLine + ", column " + currentToken.Next.BeginColumn);
retval += ("." + eol);
if (expectedTokenSequences.Length == 1)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/QueryParser.cs b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
index 3d219c1..179258c 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParser.cs
@@ -269,7 +269,7 @@ namespace Lucene.Net.QueryParsers.Classic
case RegexpToken.TERM:
fieldToken = Jj_consume_token(RegexpToken.TERM);
Jj_consume_token(RegexpToken.COLON);
- field = DiscardEscapeChar(fieldToken.image);
+ field = DiscardEscapeChar(fieldToken.Image);
break;
case RegexpToken.STAR:
Jj_consume_token(RegexpToken.STAR);
@@ -371,7 +371,7 @@ namespace Lucene.Net.QueryParsers.Classic
break;
case RegexpToken.BAREOPER:
term = Jj_consume_token(RegexpToken.BAREOPER);
- term.image = term.image.Substring(0, 1);
+ term.Image = term.Image.Substring(0, 1);
break;
default:
jj_la1[8] = jj_gen;
@@ -487,23 +487,23 @@ namespace Lucene.Net.QueryParsers.Classic
}
bool startOpen = false;
bool endOpen = false;
- if (goop1.kind == RegexpToken.RANGE_QUOTED)
+ if (goop1.Kind == RegexpToken.RANGE_QUOTED)
{
- goop1.image = goop1.image.Substring(1, goop1.image.Length - 2);
+ goop1.Image = goop1.Image.Substring(1, goop1.Image.Length - 2);
}
- else if ("*".Equals(goop1.image))
+ else if ("*".Equals(goop1.Image))
{
startOpen = true;
}
- if (goop2.kind == RegexpToken.RANGE_QUOTED)
+ if (goop2.Kind == RegexpToken.RANGE_QUOTED)
{
- goop2.image = goop2.image.Substring(1, goop2.image.Length - 2);
+ goop2.Image = goop2.Image.Substring(1, goop2.Image.Length - 2);
}
- else if ("*".Equals(goop2.image))
+ else if ("*".Equals(goop2.Image))
{
endOpen = true;
}
- q = GetRangeQuery(field, startOpen ? null : DiscardEscapeChar(goop1.image), endOpen ? null : DiscardEscapeChar(goop2.image), startInc, endInc);
+ q = GetRangeQuery(field, startOpen ? null : DiscardEscapeChar(goop1.Image), endOpen ? null : DiscardEscapeChar(goop2.Image), startInc, endInc);
break;
case RegexpToken.QUOTED:
term = Jj_consume_token(RegexpToken.QUOTED);
@@ -540,7 +540,7 @@ namespace Lucene.Net.QueryParsers.Classic
private bool Jj_2_1(int xla)
{
jj_la = xla;
- jj_lastpos = jj_scanpos = token;
+ jj_lastpos = jj_scanpos = Token;
try
{
return !Jj_3_1();
@@ -582,11 +582,11 @@ namespace Lucene.Net.QueryParsers.Classic
}
/// <summary>Generated Token Manager.</summary>
- public QueryParserTokenManager token_source;
+ public QueryParserTokenManager TokenSource { get; set; }
/// <summary>Current token.</summary>
- public Token token;
+ public Token Token { get; set; }
/// <summary>Next token.</summary>
- public Token jj_nt;
+ public Token Jj_nt { get; set; }
private int jj_ntk;
private Token jj_scanpos, jj_lastpos;
private int jj_la;
@@ -629,8 +629,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// <summary>Constructor with user supplied <see cref="ICharStream"/>. </summary>
protected internal QueryParser(ICharStream stream)
{
- token_source = new QueryParserTokenManager(stream);
- token = new Token();
+ TokenSource = new QueryParserTokenManager(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
@@ -640,8 +640,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// <summary>Reinitialize. </summary>
public override void ReInit(ICharStream stream)
{
- token_source.ReInit(stream);
- token = new Token();
+ TokenSource.ReInit(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
@@ -651,8 +651,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// <summary>Constructor with generated Token Manager. </summary>
protected QueryParser(QueryParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
@@ -662,8 +662,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// <summary>Reinitialize. </summary>
public virtual void ReInit(QueryParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 21; i++) jj_la1[i] = -1;
@@ -673,10 +673,10 @@ namespace Lucene.Net.QueryParsers.Classic
private Token Jj_consume_token(int kind)
{
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if ((oldToken = Token).Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
- if (token.kind == kind)
+ if (Token.Kind == kind)
{
jj_gen++;
if (++jj_gc > 100)
@@ -692,9 +692,9 @@ namespace Lucene.Net.QueryParsers.Classic
}
}
}
- return token;
+ return Token;
}
- token = oldToken;
+ Token = oldToken;
jj_kind = kind;
throw GenerateParseException();
}
@@ -712,31 +712,31 @@ namespace Lucene.Net.QueryParsers.Classic
if (jj_scanpos == jj_lastpos)
{
jj_la--;
- if (jj_scanpos.next == null)
+ if (jj_scanpos.Next == null)
{
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.GetNextToken();
+ jj_lastpos = jj_scanpos = jj_scanpos.Next = TokenSource.GetNextToken();
}
else
{
- jj_lastpos = jj_scanpos = jj_scanpos.next;
+ jj_lastpos = jj_scanpos = jj_scanpos.Next;
}
}
else
{
- jj_scanpos = jj_scanpos.next;
+ jj_scanpos = jj_scanpos.Next;
}
if (jj_rescan)
{
int i = 0;
- Token tok = token;
+ Token tok = Token;
while (tok != null && tok != jj_scanpos)
{
i++;
- tok = tok.next;
+ tok = tok.Next;
}
if (tok != null) Jj_add_error_token(kind, i);
}
- if (jj_scanpos.kind != kind) return true;
+ if (jj_scanpos.Kind != kind) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
return false;
}
@@ -744,31 +744,31 @@ namespace Lucene.Net.QueryParsers.Classic
/// <summary>Get the next Token. </summary>
public Token GetNextToken()
{
- if (token.next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if (Token.Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
jj_gen++;
- return token;
+ return Token;
}
/// <summary>Get the specific Token. </summary>
public Token GetToken(int index)
{
- Token t = token;
+ Token t = Token;
for (int i = 0; i < index; i++)
{
- if (t.next != null) t = t.next;
- else t = t.next = token_source.GetNextToken();
+ if (t.Next != null) t = t.Next;
+ else t = t.Next = TokenSource.GetNextToken();
}
return t;
}
private int Jj_ntk()
{
- if ((jj_nt = token.next) == null)
- return (jj_ntk = (token.next = token_source.GetNextToken()).kind);
+ if ((Jj_nt = Token.Next) == null)
+ return (jj_ntk = (Token.Next = TokenSource.GetNextToken()).Kind);
else
- return (jj_ntk = jj_nt.kind);
+ return (jj_ntk = Jj_nt.Kind);
}
private List<int[]> jj_expentries = new List<int[]>();
@@ -857,7 +857,7 @@ namespace Lucene.Net.QueryParsers.Classic
{
exptokseq[i] = jj_expentries[i];
}
- return new ParseException(token, exptokseq, QueryParserConstants.TokenImage);
+ return new ParseException(Token, exptokseq, QueryParserConstants.TokenImage);
}
/// <summary>Enable tracing. </summary>
@@ -914,7 +914,7 @@ namespace Lucene.Net.QueryParsers.Classic
p = p.next;
}
p.gen = jj_gen + xla - jj_la;
- p.first = token;
+ p.first = Token;
p.arg = xla;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/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 3fea10d..2a70cf4 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserBase.cs
@@ -806,18 +806,18 @@ namespace Lucene.Net.QueryParsers.Classic
{
Query q;
- string termImage = DiscardEscapeChar(term.image);
+ string termImage = DiscardEscapeChar(term.Image);
if (wildcard)
{
- q = GetWildcardQuery(qfield, term.image);
+ q = GetWildcardQuery(qfield, term.Image);
}
else if (prefix)
{
- q = GetPrefixQuery(qfield, DiscardEscapeChar(term.image.Substring(0, term.image.Length - 1)));
+ q = GetPrefixQuery(qfield, DiscardEscapeChar(term.Image.Substring(0, term.Image.Length - 1)));
}
else if (regexp)
{
- q = GetRegexpQuery(qfield, term.image.Substring(1, term.image.Length - 2));
+ q = GetRegexpQuery(qfield, term.Image.Substring(1, term.Image.Length - 2));
}
else if (fuzzy)
{
@@ -836,7 +836,7 @@ namespace Lucene.Net.QueryParsers.Classic
float fms = FuzzyMinSim;
try
{
- fms = float.Parse(fuzzySlop.image.Substring(1), Locale);
+ fms = float.Parse(fuzzySlop.Image.Substring(1), Locale);
}
catch (Exception /*ignored*/) { }
if (fms < 0.0f)
@@ -859,11 +859,11 @@ namespace Lucene.Net.QueryParsers.Classic
{
try
{
- s = (int)float.Parse(fuzzySlop.image.Substring(1), Locale);
+ s = (int)float.Parse(fuzzySlop.Image.Substring(1), Locale);
}
catch (Exception /*ignored*/) { }
}
- return GetFieldQuery(qfield, DiscardEscapeChar(term.image.Substring(1, term.image.Length - 2)), s);
+ return GetFieldQuery(qfield, DiscardEscapeChar(term.Image.Substring(1, term.Image.Length - 2)), s);
}
// extracted from the .jj grammar
@@ -874,7 +874,7 @@ namespace Lucene.Net.QueryParsers.Classic
float f = (float)1.0;
try
{
- f = float.Parse(boost.image, Locale);
+ f = float.Parse(boost.Image, Locale);
}
catch (Exception /*ignored*/)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/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 8e5da42..b8f2c17 100644
--- a/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Classic/QueryParserTokenManager.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Support;
using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
@@ -33,11 +34,11 @@ namespace Lucene.Net.QueryParsers.Classic
}
/// <summary>Debug output. </summary>
- public TextWriter debugStream;
+ private TextWriter debugStream; // LUCENENET specific - made private, since we already have a setter
/// <summary>Set debug output. </summary>
public virtual void SetDebugStream(TextWriter ds)
{
- debugStream = ds;
+ debugStream = new SafeTextWriterWrapper(ds);
}
private int JjStopStringLiteralDfa_2(int pos, long active0)
{
@@ -1217,10 +1218,10 @@ namespace Lucene.Net.QueryParsers.Classic
endColumn = m_input_stream.EndColumn;
t = Token.NewToken(jjmatchedKind, curTokenImage);
- t.beginLine = beginLine;
- t.endLine = endLine;
- t.beginColumn = beginColumn;
- t.endColumn = endColumn;
+ t.BeginLine = beginLine;
+ t.EndLine = endLine;
+ t.BeginColumn = beginColumn;
+ t.EndColumn = endColumn;
return t;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Classic/Token.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/Token.cs b/src/Lucene.Net.QueryParser/Classic/Token.cs
index 240693c..ad24d2c 100644
--- a/src/Lucene.Net.QueryParser/Classic/Token.cs
+++ b/src/Lucene.Net.QueryParser/Classic/Token.cs
@@ -33,53 +33,53 @@ namespace Lucene.Net.QueryParsers.Classic
/// system is determined by JavaCCParser, and a table of these numbers is
/// stored in the file ...Constants.java.
/// </summary>
- public int kind;
-
- /// <summary>The line number of the first character of this Token. </summary>
- public int beginLine;
- /// <summary>The column number of the first character of this Token. </summary>
- public int beginColumn;
- /// <summary>The line number of the last character of this Token. </summary>
- public int endLine;
- /// <summary>The column number of the last character of this Token. </summary>
- public int endColumn;
-
- /// <summary>The string image of the token.</summary>
- public string image;
-
- /// <summary>
+ public int Kind { get; set; }
+
+ /// <summary>The line number of the first character of this Token. </summary>
+ public int BeginLine { get; set; }
+ /// <summary>The column number of the first character of this Token. </summary>
+ public int BeginColumn { get; set; }
+ /// <summary>The line number of the last character of this Token. </summary>
+ public int EndLine { get; set; }
+ /// <summary>The column number of the last character of this Token. </summary>
+ public int EndColumn { get; set; }
+
+ /// <summary>The string image of the token.</summary>
+ public string Image { get; set; }
+
+ /// <summary>
/// A reference to the next regular (non-special) token from the input
- /// stream. If this is the last token from the input stream, or if the
- /// token manager has not read tokens beyond this one, this field is
- /// set to null. This is true only if this token is also a regular
- /// token. Otherwise, see below for a description of the contents of
- /// this field.
- /// </summary>
- public Token next;
-
- /// <summary>
+ /// stream. If this is the last token from the input stream, or if the
+ /// token manager has not read tokens beyond this one, this field is
+ /// set to null. This is true only if this token is also a regular
+ /// token. Otherwise, see below for a description of the contents of
+ /// this field.
+ /// </summary>
+ public Token Next { get; set; }
+
+ /// <summary>
/// This field is used to access special tokens that occur prior to this
- /// token, but after the immediately preceding regular (non-special) token.
- /// If there are no such special tokens, this field is set to null.
- /// When there are more than one such special token, this field refers
- /// to the last of these special tokens, which in turn refers to the next
- /// previous special token through its specialToken field, and so on
- /// until the first special token (whose specialToken field is null).
- /// The next fields of special tokens refer to other special tokens that
- /// immediately follow it (without an intervening regular token). If there
- /// is no such token, this field is null.
- /// </summary>
- public Token specialToken;
+ /// token, but after the immediately preceding regular (non-special) token.
+ /// If there are no such special tokens, this field is set to null.
+ /// When there are more than one such special token, this field refers
+ /// to the last of these special tokens, which in turn refers to the next
+ /// previous special token through its specialToken field, and so on
+ /// until the first special token (whose specialToken field is null).
+ /// The next fields of special tokens refer to other special tokens that
+ /// immediately follow it (without an intervening regular token). If there
+ /// is no such token, this field is null.
+ /// </summary>
+ public Token SpecialToken { get; set; }
- /// <summary>
+ /// <summary>
/// An optional attribute value of the Token.
- /// Tokens which are not used as syntactic sugar will often contain
- /// meaningful values that will be used later on by the compiler or
- /// interpreter. This attribute value is often different from the image.
- /// Any subclass of Token that actually wants to return a non-null value can
- /// override this method as appropriate.
- /// </summary>
- public virtual object Value
+ /// Tokens which are not used as syntactic sugar will often contain
+ /// meaningful values that will be used later on by the compiler or
+ /// interpreter. This attribute value is often different from the image.
+ /// Any subclass of Token that actually wants to return a non-null value can
+ /// override this method as appropriate.
+ /// </summary>
+ public virtual object Value
{
get { return null; }
}
@@ -104,8 +104,8 @@ namespace Lucene.Net.QueryParsers.Classic
/// </summary>
public Token(int kind, string image)
{
- this.kind = kind;
- this.image = image;
+ this.Kind = kind;
+ this.Image = image;
}
/// <summary>
@@ -113,7 +113,7 @@ namespace Lucene.Net.QueryParsers.Classic
/// </summary>
public override string ToString()
{
- return image;
+ return Image;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
index 70ef44c..a6f161c 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Nodes/NumericRangeQueryNode.cs
@@ -33,7 +33,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
/// <seealso cref="AbstractRangeQueryNode{T}"/>
public class NumericRangeQueryNode : AbstractRangeQueryNode<NumericQueryNode>
{
- public NumericConfig numericConfig;
+ private NumericConfig numericConfig; // LUCENENET specific: made private and added a public setter to the property
/// <summary>
/// Constructs a <see cref="NumericRangeQueryNode"/> object using the given
@@ -142,6 +142,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Nodes
public virtual NumericConfig NumericConfig
{
get { return this.numericConfig; }
+ set { this.numericConfig = value; } // LUCENENET specific: made the field private and added setter (confusing)
}
public override string ToString()
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/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 7c017e6..d3d8817 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/ParseException.cs
@@ -1,7 +1,9 @@
\ufeffusing Lucene.Net.QueryParsers.Flexible.Core;
using Lucene.Net.QueryParsers.Flexible.Core.Messages;
using Lucene.Net.QueryParsers.Flexible.Messages;
+using Lucene.Net.Support;
using System;
+using System.Diagnostics.CodeAnalysis;
using System.Text;
namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
@@ -80,21 +82,40 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// this object has been created due to a parse error, the token
/// followng this token will (therefore) be the first error token.
/// </summary>
- public Token currentToken;
+ public Token CurrentToken
+ {
+ get { return currentToken; }
+ set { currentToken = value; }
+ }
+ private Token currentToken;
/// <summary>
/// Each entry in this array is an array of integers. Each array
/// of integers represents a sequence of tokens (by their ordinal
/// values) that is expected at this point of the parse.
/// </summary>
- public int[][] expectedTokenSequences;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public int[][] ExpectedTokenSequences
+ {
+ get { return expectedTokenSequences; }
+ set { expectedTokenSequences = value; }
+ }
+ private int[][] expectedTokenSequences;
/// <summary>
/// This is a reference to the "tokenImage" array of the generated
/// parser within which the parse error occurred. This array is
/// defined in the generated ...Constants interface.
/// </summary>
- public string[] tokenImage;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public string[] TokenImage
+ {
+ get { return tokenImage; }
+ set { tokenImage = value; }
+ }
+ private string[] tokenImage;
/// <summary>
/// It uses <paramref name="currentToken"/> and <paramref name="expectedTokenSequences"/> to generate a parse
@@ -132,22 +153,22 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
expected.Append(eol).Append(" ");
}
string retval = "Encountered \"";
- Token tok = currentToken.next;
+ Token tok = currentToken.Next;
for (int i = 0; i < maxSize; i++)
{
if (i != 0) retval += " ";
- if (tok.kind == 0)
+ if (tok.Kind == 0)
{
retval += tokenImage[0];
break;
}
- retval += " " + tokenImage[tok.kind];
+ retval += " " + tokenImage[tok.Kind];
retval += " \"";
- retval += Add_Escapes(tok.image);
+ retval += Add_Escapes(tok.Image);
retval += " \"";
- tok = tok.next;
+ tok = tok.Next;
}
- retval += "\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn;
+ retval += "\" at line " + currentToken.Next.BeginLine + ", column " + currentToken.Next.BeginColumn;
retval += "." + eol;
if (expectedTokenSequences.Length == 1)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
index 5ea39a7..d3514d9 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
@@ -366,7 +366,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
Jj_consume_token(-1);
throw new ParseException();
}
- field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.image).ToString();
+ field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.Image).ToString();
q = Term(field);
break;
case RegexpToken.OP_LESSTHAN:
@@ -392,7 +392,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
Jj_consume_token(-1);
throw new ParseException();
}
- field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.image).ToString();
+ field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.Image).ToString();
switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
{
case RegexpToken.TERM:
@@ -409,20 +409,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
Jj_consume_token(-1);
throw new ParseException();
}
- if (term.kind == RegexpToken.QUOTED)
+ if (term.Kind == RegexpToken.QUOTED)
{
- term.image = term.image.Substring(1, (term.image.Length - 1) - 1);
+ term.Image = term.Image.Substring(1, (term.Image.Length - 1) - 1);
}
- switch (@operator.kind)
+ switch (@operator.Kind)
{
case RegexpToken.OP_LESSTHAN:
lowerInclusive = true;
upperInclusive = false;
qLower = new FieldQueryNode(field,
- "*", term.beginColumn, term.endColumn);
+ "*", term.BeginColumn, term.EndColumn);
qUpper = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(term.Image), term.BeginColumn, term.EndColumn);
break;
case RegexpToken.OP_LESSTHANEQ:
@@ -430,27 +430,27 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
upperInclusive = true;
qLower = new FieldQueryNode(field,
- "*", term.beginColumn, term.endColumn);
+ "*", term.BeginColumn, term.EndColumn);
qUpper = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(term.Image), term.BeginColumn, term.EndColumn);
break;
case RegexpToken.OP_MORETHAN:
lowerInclusive = false;
upperInclusive = true;
qLower = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(term.Image), term.BeginColumn, term.EndColumn);
qUpper = new FieldQueryNode(field,
- "*", term.beginColumn, term.endColumn);
+ "*", term.BeginColumn, term.EndColumn);
break;
case RegexpToken.OP_MORETHANEQ:
lowerInclusive = true;
upperInclusive = true;
qLower = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(term.Image), term.BeginColumn, term.EndColumn);
qUpper = new FieldQueryNode(field,
- "*", term.beginColumn, term.endColumn);
+ "*", term.BeginColumn, term.EndColumn);
break;
default:
{ if (true) throw new Exception("Unhandled case: operator=" + @operator.ToString()); }
@@ -490,7 +490,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
Jj_consume_token(-1);
throw new ParseException();
}
- field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.image).ToString();
+ field = EscapeQuerySyntax.DiscardEscapeChar(fieldToken.Image).ToString();
}
else
{
@@ -539,7 +539,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
float f = (float)1.0;
try
{
- f = Convert.ToSingle(boost.image, CultureInfo.InvariantCulture);
+ f = Convert.ToSingle(boost.Image, CultureInfo.InvariantCulture);
// avoid boosting null queries, such as those caused by stop words
if (q != null)
{
@@ -581,7 +581,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
case RegexpToken.TERM:
term = Jj_consume_token(RegexpToken.TERM);
- q = new FieldQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
+ q = new FieldQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.Image), term.BeginColumn, term.EndColumn);
break;
case RegexpToken.REGEXPTERM:
term = Jj_consume_token(RegexpToken.REGEXPTERM);
@@ -630,7 +630,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
float fms = defaultMinSimilarity;
try
{
- fms = Convert.ToSingle(fuzzySlop.image.Substring(1), CultureInfo.InvariantCulture);
+ fms = Convert.ToSingle(fuzzySlop.Image.Substring(1), CultureInfo.InvariantCulture);
}
#pragma warning disable 168
catch (Exception ignored) { }
@@ -643,11 +643,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
{ if (true) throw new ParseException(new Message(QueryParserMessages.INVALID_SYNTAX_FUZZY_EDITS)); }
}
- q = new FuzzyQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.image), fms, term.beginColumn, term.endColumn);
+ q = new FuzzyQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.Image), fms, term.BeginColumn, term.EndColumn);
}
else if (regexp)
{
- string re = term.image.Substring(1, (term.image.Length - 1) - 1);
+ string re = term.Image.Substring(1, (term.Image.Length - 1) - 1);
q = new RegexpQueryNode(field, re, 0, re.Length);
}
break;
@@ -726,24 +726,24 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
jj_la1[24] = jj_gen;
break;
}
- if (goop1.kind == RegexpToken.RANGE_QUOTED)
+ if (goop1.Kind == RegexpToken.RANGE_QUOTED)
{
- goop1.image = goop1.image.Substring(1, (goop1.image.Length - 1) - 1);
+ goop1.Image = goop1.Image.Substring(1, (goop1.Image.Length - 1) - 1);
}
- if (goop2.kind == RegexpToken.RANGE_QUOTED)
+ if (goop2.Kind == RegexpToken.RANGE_QUOTED)
{
- goop2.image = goop2.image.Substring(1, (goop2.image.Length - 1) - 1);
+ goop2.Image = goop2.Image.Substring(1, (goop2.Image.Length - 1) - 1);
}
qLower = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(goop1.image), goop1.beginColumn, goop1.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(goop1.Image), goop1.BeginColumn, goop1.EndColumn);
qUpper = new FieldQueryNode(field,
- EscapeQuerySyntax.DiscardEscapeChar(goop2.image), goop2.beginColumn, goop2.endColumn);
+ EscapeQuerySyntax.DiscardEscapeChar(goop2.Image), goop2.BeginColumn, goop2.EndColumn);
q = new TermRangeQueryNode(qLower, qUpper, startInc ? true : false, endInc ? true : false);
break;
case RegexpToken.QUOTED:
term = Jj_consume_token(RegexpToken.QUOTED);
- q = new QuotedFieldQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.image.Substring(1, (term.image.Length - 1) - 1)), term.beginColumn + 1, term.endColumn - 1);
+ q = new QuotedFieldQueryNode(field, EscapeQuerySyntax.DiscardEscapeChar(term.Image.Substring(1, (term.Image.Length - 1) - 1)), term.BeginColumn + 1, term.EndColumn - 1);
switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
{
case RegexpToken.FUZZY_SLOP:
@@ -769,7 +769,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
try
{
- phraseSlop = (int)Convert.ToSingle(fuzzySlop.image.Substring(1), CultureInfo.InvariantCulture);
+ phraseSlop = (int)Convert.ToSingle(fuzzySlop.Image.Substring(1), CultureInfo.InvariantCulture);
q = new SlopQueryNode(q, phraseSlop);
}
#pragma warning disable 168
@@ -792,7 +792,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
float f = (float)1.0;
try
{
- f = Convert.ToSingle(boost.image, CultureInfo.InvariantCulture);
+ f = Convert.ToSingle(boost.Image, CultureInfo.InvariantCulture);
// avoid boosting null queries, such as those caused by stop words
if (q != null)
{
@@ -814,7 +814,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
private bool Jj_2_1(int xla)
{
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla; jj_lastpos = jj_scanpos = Token;
try { return !Jj_3_1(); }
#pragma warning disable 168
catch (LookaheadSuccess ls) { return true; }
@@ -824,7 +824,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
private bool Jj_2_2(int xla)
{
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla; jj_lastpos = jj_scanpos = Token;
try { return !Jj_3_2(); }
#pragma warning disable 168
catch (LookaheadSuccess ls) { return true; }
@@ -970,11 +970,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
/// <summary>Generated Token Manager.</summary>
- public StandardSyntaxParserTokenManager token_source;
+ public StandardSyntaxParserTokenManager TokenSource { get; set; }
/// <summary>Current token.</summary>
- public Token token;
+ public Token Token { get; set; }
/// <summary>Next token.</summary>
- public Token jj_nt;
+ public Token Jj_nt { get; set; }
private int jj_ntk;
private Token jj_scanpos, jj_lastpos;
private int jj_la;
@@ -1004,8 +1004,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// </summary>
public StandardSyntaxParser(ICharStream stream)
{
- token_source = new StandardSyntaxParserTokenManager(stream);
- token = new Token();
+ TokenSource = new StandardSyntaxParserTokenManager(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 28; i++) jj_la1[i] = -1;
@@ -1015,8 +1015,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// <summary>Reinitialize.</summary>
public void ReInit(ICharStream stream)
{
- token_source.ReInit(stream);
- token = new Token();
+ TokenSource.ReInit(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 28; i++) jj_la1[i] = -1;
@@ -1026,8 +1026,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// <summary>Constructor with generated Token Manager.</summary>
public StandardSyntaxParser(StandardSyntaxParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 28; i++) jj_la1[i] = -1;
@@ -1037,8 +1037,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// <summary>Reinitialize.</summary>
public void ReInit(StandardSyntaxParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 28; i++) jj_la1[i] = -1;
@@ -1048,10 +1048,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
private Token Jj_consume_token(int kind)
{
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if ((oldToken = Token).Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
- if (token.kind == kind)
+ if (Token.Kind == kind)
{
jj_gen++;
if (++jj_gc > 100)
@@ -1067,9 +1067,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
}
}
- return token;
+ return Token;
}
- token = oldToken;
+ Token = oldToken;
jj_kind = kind;
throw GenerateParseException();
}
@@ -1081,26 +1081,26 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
if (jj_scanpos == jj_lastpos)
{
jj_la--;
- if (jj_scanpos.next == null)
+ if (jj_scanpos.Next == null)
{
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.GetNextToken();
+ jj_lastpos = jj_scanpos = jj_scanpos.Next = TokenSource.GetNextToken();
}
else
{
- jj_lastpos = jj_scanpos = jj_scanpos.next;
+ jj_lastpos = jj_scanpos = jj_scanpos.Next;
}
}
else
{
- jj_scanpos = jj_scanpos.next;
+ jj_scanpos = jj_scanpos.Next;
}
if (jj_rescan)
{
- int i = 0; Token tok = token;
- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+ int i = 0; Token tok = Token;
+ while (tok != null && tok != jj_scanpos) { i++; tok = tok.Next; }
if (tok != null) Jj_add_error_token(kind, i);
}
- if (jj_scanpos.kind != kind) return true;
+ if (jj_scanpos.Kind != kind) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
return false;
}
@@ -1109,31 +1109,31 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// <summary>Get the next Token.</summary>
public Token GetNextToken()
{
- if (token.next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if (Token.Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
jj_gen++;
- return token;
+ return Token;
}
/// <summary>Get the specific Token.</summary>
public Token GetToken(int index)
{
- Token t = token;
+ Token t = Token;
for (int i = 0; i < index; i++)
{
- if (t.next != null) t = t.next;
- else t = t.next = token_source.GetNextToken();
+ if (t.Next != null) t = t.Next;
+ else t = t.Next = TokenSource.GetNextToken();
}
return t;
}
private int Jj_ntk()
{
- if ((jj_nt = token.next) == null)
- return (jj_ntk = (token.next = token_source.GetNextToken()).kind);
+ if ((Jj_nt = Token.Next) == null)
+ return (jj_ntk = (Token.Next = TokenSource.GetNextToken()).Kind);
else
- return (jj_ntk = jj_nt.kind);
+ return (jj_ntk = Jj_nt.Kind);
}
private List<int[]> jj_expentries = new List<int[]>();
@@ -1222,7 +1222,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
{
exptokseq[i] = jj_expentries[i];
}
- return new ParseException(token, exptokseq, StandardSyntaxParserConstants.TokenImage);
+ return new ParseException(Token, exptokseq, StandardSyntaxParserConstants.TokenImage);
}
/// <summary>Enable tracing.</summary>
@@ -1272,7 +1272,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
if (p.next == null) { p = p.next = new JJCalls(); break; }
p = p.next;
}
- p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+ p.gen = jj_gen + xla - jj_la; p.first = Token; p.arg = xla;
}
internal sealed class JJCalls
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/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 9723a47..e04feef 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
@@ -1,4 +1,5 @@
-\ufeffusing System;
+\ufeffusing Lucene.Net.Support;
+using System;
using System.IO;
namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
@@ -26,9 +27,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
public class StandardSyntaxParserTokenManager /*: StandardSyntaxParserConstants*/
{
/// <summary>Debug output.</summary>
- public TextWriter debugStream = Console.Out;
+ private TextWriter debugStream = Console.Out; // LUCENENET specific - made private, since we already have a setter
/// <summary>Set debug output.</summary>
- public void SetDebugStream(TextWriter ds) { debugStream = ds; }
+ public void SetDebugStream(TextWriter ds) { debugStream = new SafeTextWriterWrapper(ds); }
private int JjStopStringLiteralDfa_2(int pos, long active0)
{
switch (pos)
@@ -853,10 +854,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
endColumn = m_input_stream.EndColumn;
t = Token.NewToken(jjmatchedKind, curTokenImage);
- t.beginLine = beginLine;
- t.endLine = endLine;
- t.beginColumn = beginColumn;
- t.endColumn = endColumn;
+ t.BeginLine = beginLine;
+ t.EndLine = endLine;
+ t.BeginColumn = beginColumn;
+ t.EndColumn = endColumn;
return t;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/Token.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/Token.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/Token.cs
index 3010278..3d3bffa 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/Token.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/Token.cs
@@ -32,21 +32,21 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// system is determined by JavaCCParser, and a table of these numbers is
/// stored in the file ...Constants.java.
/// </summary>
- public int kind;
+ public int Kind { get; set; }
/// <summary>The line number of the first character of this Token.</summary>
- public int beginLine;
+ public int BeginLine { get; set; }
/// <summary>The column number of the first character of this Token.</summary>
- public int beginColumn;
+ public int BeginColumn { get; set; }
/// <summary>The line number of the last character of this Token.</summary>
- public int endLine;
+ public int EndLine { get; set; }
/// <summary>The column number of the last character of this Token.</summary>
- public int endColumn;
+ public int EndColumn { get; set; }
/// <summary>
/// The string image of the token.
/// </summary>
- public string image;
+ public string Image { get; set; }
/// <summary>
/// A reference to the next regular (non-special) token from the input
@@ -56,7 +56,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// token. Otherwise, see below for a description of the contents of
/// this field.
/// </summary>
- public Token next;
+ public Token Next { get; set; }
/// <summary>
/// This field is used to access special tokens that occur prior to this
@@ -70,7 +70,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// immediately follow it (without an intervening regular token). If there
/// is no such token, this field is null.
/// </summary>
- public Token specialToken;
+ public Token SpecialToken { get; set; }
/// <summary>
/// An optional attribute value of the Token.
@@ -103,8 +103,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// </summary>
public Token(int kind, string image)
{
- this.kind = kind;
- this.image = image;
+ this.Kind = kind;
+ this.Image = image;
}
/// <summary>
@@ -112,7 +112,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// </summary>
public override string ToString()
{
- return image;
+ return Image;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs b/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs
index 22092ec..c2bdf27 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/ParseException.cs
@@ -1,4 +1,6 @@
-\ufeffusing System;
+\ufeffusing Lucene.Net.Support;
+using System;
+using System.Diagnostics.CodeAnalysis;
using System.Text;
namespace Lucene.Net.QueryParsers.Surround.Parser
@@ -77,21 +79,40 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// this object has been created due to a parse error, the token
/// following this token will (therefore) be the first error token.
/// </summary>
- public Token currentToken;
+ public Token CurrentToken
+ {
+ get { return currentToken; }
+ set { currentToken = value; }
+ }
+ private Token currentToken;
/// <summary>
/// Each entry in this array is an array of integers. Each array
/// of integers represents a sequence of tokens (by their ordinal
/// values) that is expected at this point of the parse.
/// </summary>
- public int[][] expectedTokenSequences;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public int[][] ExpectedTokenSequences
+ {
+ get { return expectedTokenSequences; }
+ set { expectedTokenSequences = value; }
+ }
+ private int[][] expectedTokenSequences;
/// <summary>
/// This is a reference to the "tokenImage" array of the generated
/// parser within which the parse error occurred. This array is
/// defined in the generated ...Constants interface.
/// </summary>
- public string[] tokenImage;
+ [WritableArray]
+ [SuppressMessage("Microsoft.Performance", "CA1819", Justification = "Lucene's design requires some writable array properties")]
+ public string[] TokenImage
+ {
+ get { return tokenImage; }
+ set { tokenImage = value; }
+ }
+ private string[] tokenImage;
/// <summary>
@@ -125,23 +146,23 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
expected.Append(eol).Append(" ");
}
string retval = "Encountered \"";
- Token tok = currentToken.next;
+ Token tok = currentToken.Next;
for (int i = 0; i < maxSize; i++)
{
if (i != 0)
retval += " ";
- if (tok.kind == 0)
+ if (tok.Kind == 0)
{
retval += tokenImage[0];
break;
}
- retval += (" " + tokenImage[tok.kind]);
+ retval += (" " + tokenImage[tok.Kind]);
retval += " \"";
- retval += Add_escapes(tok.image);
+ retval += Add_escapes(tok.Image);
retval += " \"";
- tok = tok.next;
+ tok = tok.Next;
}
- retval += ("\" at line " + currentToken.next.beginLine + ", column " + currentToken.next.beginColumn);
+ retval += ("\" at line " + currentToken.Next.BeginLine + ", column " + currentToken.Next.BeginColumn);
retval += ("." + eol);
if (expectedTokenSequences.Length == 1)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
index b1c2fe1..5a9d0c1 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParser.cs
@@ -101,17 +101,17 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
protected virtual SrndQuery GetOrQuery(IEnumerable<SrndQuery> queries, bool infix, Token orToken)
{
- return new OrQuery(queries, infix, orToken.image);
+ return new OrQuery(queries, infix, orToken.Image);
}
protected virtual SrndQuery GetAndQuery(IEnumerable<SrndQuery> queries, bool infix, Token andToken)
{
- return new AndQuery(queries, infix, andToken.image);
+ return new AndQuery(queries, infix, andToken.Image);
}
protected virtual SrndQuery GetNotQuery(IEnumerable<SrndQuery> queries, Token notToken)
{
- return new NotQuery(queries, notToken.image);
+ return new NotQuery(queries, notToken.Image);
}
protected static int GetOpDistance(string distanceOp)
@@ -139,10 +139,10 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
DistanceQuery dq = new DistanceQuery(queries,
infix,
- GetOpDistance(dToken.image),
- dToken.image,
+ GetOpDistance(dToken.Image),
+ dToken.Image,
ordered);
- CheckDistanceSubQueries(dq, dToken.image);
+ CheckDistanceSubQueries(dq, dToken.Image);
return dq;
}
@@ -224,7 +224,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
fieldNames = new List<string>();
}
- fieldNames.Add(fieldName.image);
+ fieldNames.Add(fieldName.Image);
}
label_1:
{ if (true) return fieldNames; }
@@ -500,38 +500,38 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
case RegexpToken.TERM:
term = Jj_consume_token(RegexpToken.TERM);
- { if (true) return GetTermQuery(term.image, false /* not quoted */); }
+ { if (true) return GetTermQuery(term.Image, false /* not quoted */); }
//break; // unreachable
case RegexpToken.QUOTED:
term = Jj_consume_token(RegexpToken.QUOTED);
- { if (true) return GetTermQuery(term.image.Substring(1, (term.image.Length - 1) - 1), true /* quoted */); }
+ { if (true) return GetTermQuery(term.Image.Substring(1, (term.Image.Length - 1) - 1), true /* quoted */); }
//break; // unreachable
case RegexpToken.SUFFIXTERM:
term = Jj_consume_token(RegexpToken.SUFFIXTERM);
/* ending in * */
- if (!AllowedSuffix(term.image))
+ if (!AllowedSuffix(term.Image))
{
- { if (true) throw new ParseException(truncationErrorMessage + term.image); }
+ { if (true) throw new ParseException(truncationErrorMessage + term.Image); }
}
- { if (true) return GetPrefixQuery(term.image.Substring(0, term.image.Length - 1), false /* not quoted */); }
+ { if (true) return GetPrefixQuery(term.Image.Substring(0, term.Image.Length - 1), false /* not quoted */); }
//break; // unreachable
case RegexpToken.TRUNCTERM:
term = Jj_consume_token(RegexpToken.TRUNCTERM);
/* with at least one * or ? */
- if (!AllowedTruncation(term.image))
+ if (!AllowedTruncation(term.Image))
{
- { if (true) throw new ParseException(truncationErrorMessage + term.image); }
+ { if (true) throw new ParseException(truncationErrorMessage + term.Image); }
}
- { if (true) return GetTruncQuery(term.image); }
+ { if (true) return GetTruncQuery(term.Image); }
//break; // unreachable
case RegexpToken.TRUNCQUOTED:
term = Jj_consume_token(RegexpToken.TRUNCQUOTED);
/* eg. "9b-b,m"* */
- if ((term.image.Length - 3) < minimumPrefixLength)
+ if ((term.Image.Length - 3) < minimumPrefixLength)
{
- { if (true) throw new ParseException(truncationErrorMessage + term.image); }
+ { if (true) throw new ParseException(truncationErrorMessage + term.Image); }
}
- { if (true) return GetPrefixQuery(term.image.Substring(1, (term.image.Length - 2) - 1), true /* quoted */); }
+ { if (true) return GetPrefixQuery(term.Image.Substring(1, (term.Image.Length - 2) - 1), true /* quoted */); }
//break; // unreachable
default:
jj_la1[8] = jj_gen;
@@ -561,15 +561,15 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
try
{
// LUCENENET TODO: Test parsing float in various cultures (.NET)
- f = float.Parse(weight.image);
+ f = float.Parse(weight.Image);
}
catch (Exception floatExc)
{
- { if (true) throw new ParseException(boostErrorMessage + weight.image + " (" + floatExc + ")"); }
+ { if (true) throw new ParseException(boostErrorMessage + weight.Image + " (" + floatExc + ")"); }
}
if (f <= 0.0)
{
- { if (true) throw new ParseException(boostErrorMessage + weight.image); }
+ { if (true) throw new ParseException(boostErrorMessage + weight.Image); }
}
q.Weight = (f * q.Weight); /* left associative, fwiw */
}
@@ -578,7 +578,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
private bool Jj_2_1(int xla)
{
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla; jj_lastpos = jj_scanpos = Token;
try { return !Jj_3_1(); }
catch (LookaheadSuccess) { return true; }
finally { Jj_save(0, xla); }
@@ -592,11 +592,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
/// <summary>Generated Token Manager.</summary>
- public QueryParserTokenManager token_source;
+ public QueryParserTokenManager TokenSource { get; set; }
/// <summary>Current token.</summary>
- public Token token;
+ public Token Token { get; set; }
/// <summary>Next token.</summary>
- public Token jj_nt;
+ public Token Jj_nt { get; set; }
private int jj_ntk;
private Token jj_scanpos, jj_lastpos;
private int jj_la;
@@ -619,8 +619,8 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// <summary>Constructor with user supplied <see cref="ICharStream"/>.</summary>
public QueryParser(ICharStream stream)
{
- token_source = new QueryParserTokenManager(stream);
- token = new Token();
+ TokenSource = new QueryParserTokenManager(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 10; i++) jj_la1[i] = -1;
@@ -630,8 +630,8 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// <summary>Reinitialize.</summary>
public virtual void ReInit(ICharStream stream)
{
- token_source.ReInit(stream);
- token = new Token();
+ TokenSource.ReInit(stream);
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 10; i++) jj_la1[i] = -1;
@@ -641,8 +641,8 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// <summary>Constructor with generated Token Manager.</summary>
public QueryParser(QueryParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 10; i++) jj_la1[i] = -1;
@@ -652,8 +652,8 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// <summary>Reinitialize.</summary>
public virtual void ReInit(QueryParserTokenManager tm)
{
- token_source = tm;
- token = new Token();
+ TokenSource = tm;
+ Token = new Token();
jj_ntk = -1;
jj_gen = 0;
for (int i = 0; i < 10; i++) jj_la1[i] = -1;
@@ -663,10 +663,10 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
private Token Jj_consume_token(int kind)
{
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if ((oldToken = Token).Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
- if (token.kind == kind)
+ if (Token.Kind == kind)
{
jj_gen++;
if (++jj_gc > 100)
@@ -682,9 +682,9 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
}
}
}
- return token;
+ return Token;
}
- token = oldToken;
+ Token = oldToken;
jj_kind = kind;
throw GenerateParseException();
}
@@ -697,26 +697,26 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
if (jj_scanpos == jj_lastpos)
{
jj_la--;
- if (jj_scanpos.next == null)
+ if (jj_scanpos.Next == null)
{
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.GetNextToken();
+ jj_lastpos = jj_scanpos = jj_scanpos.Next = TokenSource.GetNextToken();
}
else
{
- jj_lastpos = jj_scanpos = jj_scanpos.next;
+ jj_lastpos = jj_scanpos = jj_scanpos.Next;
}
}
else
{
- jj_scanpos = jj_scanpos.next;
+ jj_scanpos = jj_scanpos.Next;
}
if (jj_rescan)
{
- int i = 0; Token tok = token;
- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
+ int i = 0; Token tok = Token;
+ while (tok != null && tok != jj_scanpos) { i++; tok = tok.Next; }
if (tok != null) Jj_add_error_token(kind, i);
}
- if (jj_scanpos.kind != kind) return true;
+ if (jj_scanpos.Kind != kind) return true;
if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
return false;
}
@@ -724,31 +724,31 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// <summary>Get the next Token.</summary>
public Token GetNextToken()
{
- if (token.next != null) token = token.next;
- else token = token.next = token_source.GetNextToken();
+ if (Token.Next != null) Token = Token.Next;
+ else Token = Token.Next = TokenSource.GetNextToken();
jj_ntk = -1;
jj_gen++;
- return token;
+ return Token;
}
/// <summary>Get the specific Token.</summary>
public Token GetToken(int index)
{
- Token t = token;
+ Token t = Token;
for (int i = 0; i < index; i++)
{
- if (t.next != null) t = t.next;
- else t = t.next = token_source.GetNextToken();
+ if (t.Next != null) t = t.Next;
+ else t = t.Next = TokenSource.GetNextToken();
}
return t;
}
private int Jj_ntk()
{
- if ((jj_nt = token.next) == null)
- return (jj_ntk = (token.next = token_source.GetNextToken()).kind);
+ if ((Jj_nt = Token.Next) == null)
+ return (jj_ntk = (Token.Next = TokenSource.GetNextToken()).Kind);
else
- return (jj_ntk = jj_nt.kind);
+ return (jj_ntk = Jj_nt.Kind);
}
private IList<int[]> jj_expentries = new List<int[]>();
@@ -832,7 +832,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
{
exptokseq[i] = jj_expentries[i];
}
- return new ParseException(token, exptokseq, QueryParserConstants.TokenImage);
+ return new ParseException(Token, exptokseq, QueryParserConstants.TokenImage);
}
/// <summary>Enable tracing. </summary>
@@ -879,7 +879,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
if (p.next == null) { p = p.next = new JJCalls(); break; }
p = p.next;
}
- p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+ p.gen = jj_gen + xla - jj_la; p.first = Token; p.arg = xla;
}
internal sealed class JJCalls
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/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 58fcbbf..f477104 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/QueryParserTokenManager.cs
@@ -1,4 +1,5 @@
-\ufeffusing System;
+\ufeffusing Lucene.Net.Support;
+using System;
using System.Diagnostics.CodeAnalysis;
using System.IO;
@@ -27,11 +28,11 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
public class QueryParserTokenManager //: QueryParserConstants
{
/// <summary>Debug output. </summary>
- public TextWriter debugStream;
+ private TextWriter debugStream; // LUCENENET specific - made private, since we already have a setter
/// <summary>Set debug output. </summary>
public virtual void SetDebugStream(TextWriter ds)
{
- debugStream = ds;
+ debugStream = new SafeTextWriterWrapper(ds);
}
private int JjStopStringLiteralDfa_1(int pos, long active0)
{
@@ -626,10 +627,10 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
endColumn = m_input_stream.EndColumn;
t = Token.NewToken(jjmatchedKind, curTokenImage);
- t.beginLine = beginLine;
- t.endLine = endLine;
- t.beginColumn = beginColumn;
- t.endColumn = endColumn;
+ t.BeginLine = beginLine;
+ t.EndLine = endLine;
+ t.BeginColumn = beginColumn;
+ t.EndColumn = endColumn;
return t;
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.QueryParser/Surround/Parser/Token.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/Token.cs b/src/Lucene.Net.QueryParser/Surround/Parser/Token.cs
index 7813dd7..32f95da 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/Token.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/Token.cs
@@ -27,59 +27,59 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
#endif
public class Token
{
-
- /// <summary>
+
+ /// <summary>
/// An integer that describes the kind of this token. This numbering
- /// system is determined by JavaCCParser, and a table of these numbers is
- /// stored in the file ...Constants.java.
- /// </summary>
- public int kind;
+ /// system is determined by JavaCCParser, and a table of these numbers is
+ /// stored in the file ...Constants.java.
+ /// </summary>
+ public int Kind { get; set; }
/// <summary>The line number of the first character of this Token. </summary>
- public int beginLine;
- /// <summary>The column number of the first character of this Token. </summary>
- public int beginColumn;
- /// <summary>The line number of the last character of this Token. </summary>
- public int endLine;
- /// <summary>The column number of the last character of this Token. </summary>
- public int endColumn;
-
- /// <summary>The string image of the token.</summary>
- public string image;
-
- /// <summary>
+ public int BeginLine { get; set; }
+ /// <summary>The column number of the first character of this Token. </summary>
+ public int BeginColumn { get; set; }
+ /// <summary>The line number of the last character of this Token. </summary>
+ public int EndLine { get; set; }
+ /// <summary>The column number of the last character of this Token. </summary>
+ public int EndColumn { get; set; }
+
+ /// <summary>The string image of the token.</summary>
+ public string Image { get; set; }
+
+ /// <summary>
/// A reference to the next regular (non-special) token from the input
- /// stream. If this is the last token from the input stream, or if the
- /// token manager has not read tokens beyond this one, this field is
- /// set to null. This is true only if this token is also a regular
- /// token. Otherwise, see below for a description of the contents of
- /// this field.
- /// </summary>
- public Token next;
-
- /// <summary>
+ /// stream. If this is the last token from the input stream, or if the
+ /// token manager has not read tokens beyond this one, this field is
+ /// set to null. This is true only if this token is also a regular
+ /// token. Otherwise, see below for a description of the contents of
+ /// this field.
+ /// </summary>
+ public Token Next { get; set; }
+
+ /// <summary>
/// This field is used to access special tokens that occur prior to this
- /// token, but after the immediately preceding regular (non-special) token.
- /// If there are no such special tokens, this field is set to null.
- /// When there are more than one such special token, this field refers
- /// to the last of these special tokens, which in turn refers to the next
- /// previous special token through its specialToken field, and so on
- /// until the first special token (whose specialToken field is null).
- /// The next fields of special tokens refer to other special tokens that
- /// immediately follow it (without an intervening regular token). If there
- /// is no such token, this field is null.
- /// </summary>
- public Token specialToken;
+ /// token, but after the immediately preceding regular (non-special) token.
+ /// If there are no such special tokens, this field is set to null.
+ /// When there are more than one such special token, this field refers
+ /// to the last of these special tokens, which in turn refers to the next
+ /// previous special token through its specialToken field, and so on
+ /// until the first special token (whose specialToken field is null).
+ /// The next fields of special tokens refer to other special tokens that
+ /// immediately follow it (without an intervening regular token). If there
+ /// is no such token, this field is null.
+ /// </summary>
+ public Token SpecialToken { get; set; }
- /// <summary>
+ /// <summary>
/// An optional attribute value of the Token.
- /// Tokens which are not used as syntactic sugar will often contain
- /// meaningful values that will be used later on by the compiler or
- /// interpreter. This attribute value is often different from the image.
- /// Any subclass of Token that actually wants to return a non-null value can
- /// override this method as appropriate.
- /// </summary>
- public virtual object Value
+ /// Tokens which are not used as syntactic sugar will often contain
+ /// meaningful values that will be used later on by the compiler or
+ /// interpreter. This attribute value is often different from the image.
+ /// Any subclass of Token that actually wants to return a non-null value can
+ /// override this method as appropriate.
+ /// </summary>
+ public virtual object Value
{
get { return null; }
}
@@ -104,8 +104,8 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// </summary>
public Token(int kind, string image)
{
- this.kind = kind;
- this.image = image;
+ this.Kind = kind;
+ this.Image = image;
}
/// <summary>
@@ -113,7 +113,7 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// </summary>
public override string ToString()
{
- return image;
+ return Image;
}
/// <summary>
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/13db3e69/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
index 34b2f47..ab63341 100644
--- a/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Classic/TestQueryParser.cs
@@ -170,12 +170,12 @@ namespace Lucene.Net.QueryParsers.Classic
internal override Query HandleBareFuzzy(string qfield, Token fuzzySlop, string termImage)
{
- if (fuzzySlop.image.EndsWith("\u20ac"))
+ if (fuzzySlop.Image.EndsWith("\u20ac"))
{
float fms = FuzzyMinSim;
try
{
- fms = float.Parse(fuzzySlop.image.Substring(1, fuzzySlop.image.Length - 2));
+ fms = float.Parse(fuzzySlop.Image.Substring(1, fuzzySlop.Image.Length - 2));
}
catch (Exception /*ignored*/) { }
float value = float.Parse(termImage);
[11/15] lucenenet git commit:
Lucene.Net.QueryParser.Surround.Query.FieldsQuery refactor: OrOperatorName
(field) > orOperatorName
Posted by ni...@apache.org.
Lucene.Net.QueryParser.Surround.Query.FieldsQuery refactor: OrOperatorName (field) > orOperatorName
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ad3db5a5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ad3db5a5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ad3db5a5
Branch: refs/heads/api-work
Commit: ad3db5a5977148dde7e6278be6549c5f3ef6caa7
Parents: b170b54
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 10:33:19 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 10:33:19 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ad3db5a5/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
index df2c6e7..c6c648c 100644
--- a/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Query/FieldsQuery.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
private SrndQuery q;
private IEnumerable<string> fieldNames;
private readonly char fieldOp;
- private readonly string OrOperatorName = "OR"; /* for expanded queries, not normally visible */
+ private readonly string orOperatorName = "OR"; /* for expanded queries, not normally visible */
public FieldsQuery(SrndQuery q, IEnumerable<string> fieldNames, char fieldOp)
{
@@ -68,7 +68,7 @@ namespace Lucene.Net.QueryParsers.Surround.Query
}
OrQuery oq = new OrQuery(queries,
true /* infix OR for field names */,
- OrOperatorName);
+ orOperatorName);
// System.out.println(getClass().toString() + ", fields expanded: " + oq.toString()); /* needs testing */
return oq.MakeLuceneQueryField(null, qf);
}
[15/15] lucenenet git commit: Lucene.Net.Queries.TermsFilter: Changed
parameters and return types from List to IList
Posted by ni...@apache.org.
Lucene.Net.Queries.TermsFilter: Changed parameters and return types from List<T> to IList<T>
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/a6168d07
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/a6168d07
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/a6168d07
Branch: refs/heads/api-work
Commit: a6168d076d10c58c79305984098c1bbfee577acf
Parents: a007bec
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 12:18:23 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 12:18:23 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.Queries/TermsFilter.cs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/a6168d07/src/Lucene.Net.Queries/TermsFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Queries/TermsFilter.cs b/src/Lucene.Net.Queries/TermsFilter.cs
index 8f9e17b..8e13032 100644
--- a/src/Lucene.Net.Queries/TermsFilter.cs
+++ b/src/Lucene.Net.Queries/TermsFilter.cs
@@ -55,7 +55,7 @@ namespace Lucene.Net.Queries
/// Creates a new <see cref="TermsFilter"/> from the given list. The list
/// can contain duplicate terms and multiple fields.
/// </summary>
- public TermsFilter(List<Term> terms)
+ public TermsFilter(IList<Term> terms)
: this(new FieldAndTermEnumAnonymousInnerClassHelper(terms), terms.Count)
{
}
@@ -64,7 +64,7 @@ namespace Lucene.Net.Queries
{
private IList<Term> terms;
- public FieldAndTermEnumAnonymousInnerClassHelper(List<Term> terms)
+ public FieldAndTermEnumAnonymousInnerClassHelper(IList<Term> terms)
{
if (!terms.Any())
{
@@ -94,7 +94,7 @@ namespace Lucene.Net.Queries
/// Creates a new <see cref="TermsFilter"/> from the given <see cref="BytesRef"/> list for
/// a single field.
/// </summary>
- public TermsFilter(string field, List<BytesRef> terms) // LUCENENET TODO: Change to IList<BytesRef>
+ public TermsFilter(string field, IList<BytesRef> terms)
: this(new FieldAndTermEnumAnonymousInnerClassHelper2(field, terms), terms.Count)
{
}
@@ -103,7 +103,7 @@ namespace Lucene.Net.Queries
{
private IList<BytesRef> terms;
- public FieldAndTermEnumAnonymousInnerClassHelper2(string field, List<BytesRef> terms)
+ public FieldAndTermEnumAnonymousInnerClassHelper2(string field, IList<BytesRef> terms)
: base(field)
{
if (!terms.Any())
[08/15] lucenenet git commit:
Lucene.net.QueryParser.Simple.SimpleQueryParser.State refactor: changed
accessibilty of all members back to internal (including public array
properties)
Posted by ni...@apache.org.
Lucene.net.QueryParser.Simple.SimpleQueryParser.State refactor: changed accessibilty of all members back to internal (including public array properties)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/f09f5ce8
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/f09f5ce8
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/f09f5ce8
Branch: refs/heads/api-work
Commit: f09f5ce8dd10ece33a493a7ebc360ac1b7636f1e
Parents: 3321ce0
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 10:15:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 10:15:26 2017 +0700
----------------------------------------------------------------------
.../Simple/SimpleQueryParser.cs | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/f09f5ce8/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs b/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
index f8cbf4f..7a4b1b9 100644
--- a/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
+++ b/src/Lucene.Net.QueryParser/Simple/SimpleQueryParser.cs
@@ -710,7 +710,7 @@ namespace Lucene.Net.QueryParsers.Simple
}
- public class State
+ internal class State
{
//private readonly char[] data; // the characters in the query string
//private readonly char[] buffer; // a temporary buffer used to reduce necessary allocations
@@ -731,12 +731,12 @@ namespace Lucene.Net.QueryParsers.Simple
this.Length = length;
}
- public char[] Data { get; protected set; } // the characters in the query string
- public char[] Buffer { get; protected set; } // a temporary buffer used to reduce necessary allocations
- public int Index { get; set; }
- public int Length { get; protected set; }
+ internal char[] Data { get; private set; } // the characters in the query string
+ internal char[] Buffer { get; private set; } // a temporary buffer used to reduce necessary allocations
+ internal int Index { get; set; }
+ internal int Length { get; set; }
- public Occur CurrentOperation
+ internal Occur CurrentOperation
{
get
{
@@ -749,7 +749,7 @@ namespace Lucene.Net.QueryParsers.Simple
}
}
- public Occur PreviousOperation
+ internal Occur PreviousOperation
{
get
{
@@ -762,11 +762,11 @@ namespace Lucene.Net.QueryParsers.Simple
}
}
- public bool CurrentOperationIsSet { get; set; }
- public bool PreviousOperationIsSet { get; set; }
+ internal bool CurrentOperationIsSet { get; set; }
+ internal bool PreviousOperationIsSet { get; set; }
- public int Not { get; set; }
- public Query Top { get; set; }
+ internal int Not { get; set; }
+ internal Query Top { get; set; }
}
}
}
[12/15] lucenenet git commit: Lucene.Net.QueryParser (Classic +
Flexible.Standard.Parser + Surround.Parser) TokenMgrError refactor: changed
parameter from EOFSeen > eofSeen (convention)
Posted by ni...@apache.org.
Lucene.Net.QueryParser (Classic + Flexible.Standard.Parser + Surround.Parser) TokenMgrError refactor: changed parameter from EOFSeen > eofSeen (convention)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/7667d56c
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/7667d56c
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/7667d56c
Branch: refs/heads/api-work
Commit: 7667d56c1296229d4a633bff5156421ddd0530ad
Parents: ad3db5a
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 10:48:26 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 10:50:01 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs | 12 ++++++------
.../Flexible/Standard/Parser/TokenMgrError.cs | 12 ++++++------
.../Surround/Parser/TokenMgrError.cs | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7667d56c/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
index 989e0fa..38e75f0 100644
--- a/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Classic/TokenMgrError.cs
@@ -51,7 +51,7 @@ namespace Lucene.Net.QueryParsers.Classic
/// Replaces unprintable characters by their escaped (or unicode escaped)
/// equivalents in the given string
/// </summary>
- protected internal static string AddEscapes(string str)
+ protected static string AddEscapes(string str)
{
StringBuilder retval = new StringBuilder();
char ch;
@@ -117,19 +117,19 @@ namespace Lucene.Net.QueryParsers.Classic
/// token manager to indicate a lexical error.
/// </summary>
/// <remarks>You can customize the lexical error message by modifying this method.</remarks>
- /// <param name="EOFSeen">indicates if EOF caused the lexical error</param>
+ /// <param name="eofSeen">indicates if EOF caused the lexical error</param>
/// <param name="lexState">lexical state in which this error occurred</param>
/// <param name="errorLine">line number when the error occurred</param>
/// <param name="errorColumn">column number when the error occurred</param>
/// <param name="errorAfter">prefix that was seen before this error occurred</param>
/// <param name="curChar">the offending character</param>
/// <returns>Detailed error message</returns>
- protected internal static string LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
+ protected internal static string LexicalError(bool eofSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
{
return ("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + AddEscapes(Convert.ToString(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+ (eofSeen ? "<EOF> " : ("\"" + AddEscapes(Convert.ToString(curChar)) + "\"") + " (" + (int)curChar + "), ") +
"after : \"" + AddEscapes(errorAfter) + "\"");
}
@@ -164,8 +164,8 @@ namespace Lucene.Net.QueryParsers.Classic
}
/// <summary>Full Constructor. </summary>
- public TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar, int reason)
- : this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason)
+ public TokenMgrError(bool eofSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar, int reason)
+ : this(LexicalError(eofSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason)
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7667d56c/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
index 494a6b9..6767b28 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/TokenMgrError.cs
@@ -115,19 +115,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
/// Returns a detailed message for the Error when it is thrown by the
/// token manager to indicate a lexical error.
/// </summary>
- /// <param name="EOFSeen">indicates if EOF caused the lexical error</param>
+ /// <param name="eofSeen">indicates if EOF caused the lexical error</param>
/// <param name="lexState">lexical state in which this error occurred</param>
/// <param name="errorLine">line number when the error occurred</param>
/// <param name="errorColumn">column number when the error occurred</param>
/// <param name="errorAfter">prefix that was seen before this error occurred</param>
/// <param name="curChar">the offending character</param>
/// <remarks>Note: You can customize the lexical error message by modifying this method.</remarks>
- protected static string LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
+ protected static string LexicalError(bool eofSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
{
return ("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + AddEscapes(curChar.ToString()) + "\"") + " (" + (int)curChar + "), ") +
+ (eofSeen ? "<EOF> " : ("\"" + AddEscapes(curChar.ToString()) + "\"") + " (" + (int)curChar + "), ") +
"after : \"" + AddEscapes(errorAfter) + "\"");
}
@@ -160,15 +160,15 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
}
/// <summary>Full Constructor.</summary>
- /// <param name="EOFSeen">indicates if EOF caused the lexical error</param>
+ /// <param name="eofSeen">indicates if EOF caused the lexical error</param>
/// <param name="lexState">lexical state in which this error occurred</param>
/// <param name="errorLine">line number when the error occurred</param>
/// <param name="errorColumn">column number when the error occurred</param>
/// <param name="errorAfter">prefix that was seen before this error occurred</param>
/// <param name="curChar">the offending character</param>
/// <param name="reason"></param>
- public TokenMgrError(bool EOFSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar, int reason)
- : this(LexicalError(EOFSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason)
+ public TokenMgrError(bool eofSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar, int reason)
+ : this(LexicalError(eofSeen, lexState, errorLine, errorColumn, errorAfter, curChar), reason)
{
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/7667d56c/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs b/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
index 5f539e1..6384395 100644
--- a/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
+++ b/src/Lucene.Net.QueryParser/Surround/Parser/TokenMgrError.cs
@@ -117,19 +117,19 @@ namespace Lucene.Net.QueryParsers.Surround.Parser
/// token manager to indicate a lexical error.
/// </summary>
/// <remarks>You can customize the lexical error message by modifying this method.</remarks>
- /// <param name="EOFSeen">indicates if EOF caused the lexical error</param>
+ /// <param name="eofSeen">indicates if EOF caused the lexical error</param>
/// <param name="lexState">lexical state in which this error occurred</param>
/// <param name="errorLine">line number when the error occurred</param>
/// <param name="errorColumn">column number when the error occurred</param>
/// <param name="errorAfter">prefix that was seen before this error occurred</param>
/// <param name="curChar">the offending character</param>
/// <returns>Detailed error message</returns>
- protected internal static string LexicalError(bool EOFSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
+ protected internal static string LexicalError(bool eofSeen, int lexState, int errorLine, int errorColumn, string errorAfter, char curChar)
{
return ("Lexical error at line " +
errorLine + ", column " +
errorColumn + ". Encountered: " +
- (EOFSeen ? "<EOF> " : ("\"" + AddEscapes(Convert.ToString(curChar)) + "\"") + " (" + (int)curChar + "), ") +
+ (eofSeen ? "<EOF> " : ("\"" + AddEscapes(Convert.ToString(curChar)) + "\"") + " (" + (int)curChar + "), ") +
"after : \"" + AddEscapes(errorAfter) + "\"");
}
[02/15] lucenenet git commit:
Lucene.Net.Sandbox.Queries.SlowFuzzyQuery: renamed protected field term >
m_term
Posted by ni...@apache.org.
Lucene.Net.Sandbox.Queries.SlowFuzzyQuery: renamed protected field term > m_term
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/2bf7b0a1
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/2bf7b0a1
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/2bf7b0a1
Branch: refs/heads/api-work
Commit: 2bf7b0a1e1eca163631a313c53da438623fbd34e
Parents: a79fd08
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 09:47:27 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 09:47:27 2017 +0700
----------------------------------------------------------------------
.../Queries/SlowFuzzyQuery.cs | 22 ++++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/2bf7b0a1/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
index 7889613..77ec159 100644
--- a/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
+++ b/src/Lucene.Net.Sandbox/Queries/SlowFuzzyQuery.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.Sandbox.Queries
private int prefixLength;
private bool termLongEnough = false;
- protected Term term;
+ protected Term m_term;
/// <summary>
/// Create a new <see cref="SlowFuzzyQuery"/> that will match terms with a similarity
@@ -79,7 +79,7 @@ namespace Lucene.Net.Sandbox.Queries
int maxExpansions)
: base(term.Field)
{
- this.term = term;
+ this.m_term = term;
if (minimumSimilarity >= 1.0f && minimumSimilarity != (int)minimumSimilarity)
throw new ArgumentException("fractional edit distances are not allowed");
@@ -150,7 +150,7 @@ namespace Lucene.Net.Sandbox.Queries
{
if (!termLongEnough)
{ // can only match if it's exact
- return new SingleTermsEnum(terms.GetIterator(null), term.Bytes);
+ return new SingleTermsEnum(terms.GetIterator(null), m_term.Bytes);
}
return new SlowFuzzyTermsEnum(terms, atts, Term, minimumSimilarity, prefixLength);
}
@@ -160,18 +160,18 @@ namespace Lucene.Net.Sandbox.Queries
/// </summary>
public virtual Term Term
{
- get { return term; }
+ get { return m_term; }
}
public override string ToString(string field)
{
StringBuilder buffer = new StringBuilder();
- if (!term.Field.Equals(field))
+ if (!m_term.Field.Equals(field))
{
- buffer.Append(term.Field);
+ buffer.Append(m_term.Field);
buffer.Append(":");
}
- buffer.Append(term.Text());
+ buffer.Append(m_term.Text());
buffer.Append('~');
buffer.Append(Number.ToString(minimumSimilarity));
buffer.Append(ToStringUtils.Boost(Boost));
@@ -184,7 +184,7 @@ namespace Lucene.Net.Sandbox.Queries
int result = base.GetHashCode();
result = prime * result + Number.FloatToIntBits(minimumSimilarity);
result = prime * result + prefixLength;
- result = prime * result + ((term == null) ? 0 : term.GetHashCode());
+ result = prime * result + ((m_term == null) ? 0 : m_term.GetHashCode());
return result;
}
@@ -202,12 +202,12 @@ namespace Lucene.Net.Sandbox.Queries
return false;
if (prefixLength != other.prefixLength)
return false;
- if (term == null)
+ if (m_term == null)
{
- if (other.term != null)
+ if (other.m_term != null)
return false;
}
- else if (!term.Equals(other.term))
+ else if (!m_term.Equals(other.m_term))
return false;
return true;
}
[07/15] lucenenet git commit:
Lucene.Net.QueryParser.Flexible.Messages.Message.GetArguments() refactor:
Changed return to clone the array so it cannot be changed from outside of the
class.
Posted by ni...@apache.org.
Lucene.Net.QueryParser.Flexible.Messages.Message.GetArguments() refactor: Changed return to clone the array so it cannot be changed from outside of the class.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3321ce08
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3321ce08
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3321ce08
Branch: refs/heads/api-work
Commit: 3321ce0803dbb908968ffaa5698cc75e1b3119bb
Parents: 48d6cd5
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Feb 1 10:06:28 2017 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Feb 1 10:06:28 2017 +0700
----------------------------------------------------------------------
src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3321ce08/src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs b/src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs
index c99a247..24d0d0c 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Messages/MessageImpl.cs
@@ -44,7 +44,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Messages
public virtual object[] GetArguments()
{
- return this.arguments;
+ return (object[])this.arguments.Clone(); // LUCENENET specific: These are obviously not meant to be written to, so cloning the result
}
public virtual string Key