You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2016/09/01 14:36:22 UTC
[02/22] lucenenet git commit: Fixed issues that were causing the
project not to compile in VS2012.
Fixed issues that were causing the project not to compile in VS2012.
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/85789c09
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/85789c09
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/85789c09
Branch: refs/heads/analysis-work
Commit: 85789c0906337392f4ddc9d91fba213e61c2e177
Parents: d4dd1d6
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Wed Aug 24 17:42:36 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Wed Aug 24 17:42:36 2016 +0700
----------------------------------------------------------------------
.../Analysis/Nl/DutchAnalyzer.cs | 3 +--
.../Analysis/Ru/RussianLetterTokenizerFactory.cs | 4 ++--
.../Analysis/Synonym/SynonymFilter.cs | 10 +++++-----
.../Analysis/Miscellaneous/TestStemmerOverrideFilter.cs | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85789c09/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
index ad57c53..cc9784f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
@@ -7,7 +7,6 @@ using Lucene.Net.Util;
using System;
using System.IO;
using System.Text;
-using static Lucene.Net.Analysis.Miscellaneous.StemmerOverrideFilter;
namespace Lucene.Net.Analysis.Nl
{
@@ -113,7 +112,7 @@ namespace Lucene.Net.Analysis.Nl
/// </summary>
private CharArraySet excltable = CharArraySet.EMPTY_SET;
- private readonly StemmerOverrideMap stemdict;
+ private readonly StemmerOverrideFilter.StemmerOverrideMap stemdict;
// null if on 3.1 or later - only for bw compat
private readonly CharArrayMap<string> origStemdict;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85789c09/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
index ba27ee7..666469e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
@@ -1,8 +1,8 @@
\ufeffusing Lucene.Net.Analysis.Util;
+using Lucene.Net.Util;
using System;
using System.Collections.Generic;
using System.IO;
-using static Lucene.Net.Util.AttributeSource;
namespace Lucene.Net.Analysis.Ru
{
@@ -40,7 +40,7 @@ namespace Lucene.Net.Analysis.Ru
}
}
- public override Tokenizer Create(AttributeFactory factory, TextReader input)
+ public override Tokenizer Create(AttributeSource.AttributeFactory factory, TextReader input)
{
return new RussianLetterTokenizer(luceneMatchVersion, factory, input);
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85789c09/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
index d1ef34e..ced9330 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
@@ -383,10 +383,10 @@ namespace Lucene.Net.Analysis.Synonym
{
buffer = termAtt.Buffer();
bufferLen = termAtt.Length;
- PendingInput input = futureInputs[nextWrite];
- lastStartOffset = input.startOffset = offsetAtt.StartOffset();
- lastEndOffset = input.endOffset = offsetAtt.EndOffset();
- inputEndOffset = input.endOffset;
+ PendingInput pendingInput = futureInputs[nextWrite];
+ lastStartOffset = pendingInput.startOffset = offsetAtt.StartOffset();
+ lastEndOffset = pendingInput.endOffset = offsetAtt.EndOffset();
+ inputEndOffset = pendingInput.endOffset;
//System.out.println(" new token=" + new String(buffer, 0, bufferLen));
if (nextRead != nextWrite)
{
@@ -394,7 +394,7 @@ namespace Lucene.Net.Analysis.Synonym
}
else
{
- input.consumed = false;
+ pendingInput.consumed = false;
}
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/85789c09/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
index b67ed2e..9ef56ef 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
@@ -1,5 +1,6 @@
\ufeffusing Lucene.Net.Analysis.Core;
using Lucene.Net.Analysis.En;
+using Lucene.Net.Analysis.Miscellaneous;
using Lucene.Net.Support;
using Lucene.Net.Util;
using NUnit.Framework;
@@ -7,7 +8,6 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
-using static Lucene.Net.Analysis.Miscellaneous.StemmerOverrideFilter;
namespace Lucene.Net.Analysis.Miscellaneous
{
@@ -137,7 +137,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
{
builder.Add(entry.Key, entry.Value);
}
- StemmerOverrideMap build = builder.Build();
+ StemmerOverrideFilter.StemmerOverrideMap build = builder.Build();
foreach (KeyValuePair<string, string> entry in entrySet)
{
if (Random().nextBoolean())