Lucene.Net.Util.Fst.Int32sRefFSTEnum: Added MoveNext() method and mar…

…ked Next() method obsolete. See #279. This change had already been done to BytesRefFSTEnum, which made them inconsistent.
apache · Dec 20, 2021 · 26d65f2 · 26d65f2
1 parent 82687a2
commit 26d65f2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git a/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs b/src/Lucene.Net.TestFramework/Util/Fst/FSTTester.cs
@@ -492,12 +492,13 @@ private void VerifyUnPruned(int inputMode, FST<T> fst)
                     Assert.IsTrue(OutputsEqual(pair.Output, output));
 
                     // verify enum's next
-                    Int32sRefFSTEnum.InputOutput<T> t = fstEnum.Next();
+                    Assert.IsTrue(fstEnum.MoveNext());
+                    Int32sRefFSTEnum.InputOutput<T> t = fstEnum.Current;
                     Assert.IsNotNull(t);
                     Assert.AreEqual(term, t.Input, "expected input=" + InputToString(inputMode, term) + " but fstEnum returned " + InputToString(inputMode, t.Input));
                     Assert.IsTrue(OutputsEqual(pair.Output, t.Output));
                 }
-                Assert.IsNull(fstEnum.Next());
+                Assert.IsFalse(fstEnum.MoveNext());
             }
 
             IDictionary<Int32sRef, T> termsMap = new Dictionary<Int32sRef, T>();
@@ -686,7 +687,7 @@ private void VerifyUnPruned(int inputMode, FST<T> fst)
                         {
                             Console.WriteLine("  do next");
                         }
-                        isDone = fstEnum_.Next() == null;
+                        isDone = fstEnum_.MoveNext() == false;
                     }
                     else if (upto != -1 && upto < 0.75 * pairs.Count && random.NextBoolean())
                     {
@@ -974,8 +975,9 @@ private void VerifyPruned(int inputMode, FST<T> fst, int prune1, int prune2)
             }
             Int32sRefFSTEnum<T> fstEnum = new Int32sRefFSTEnum<T>(fst);
             Int32sRefFSTEnum.InputOutput<T> current;
-            while ((current = fstEnum.Next()) != null)
+            while (fstEnum.MoveNext())
             {
+                current = fstEnum.Current;
                 if (LuceneTestCase.Verbose)
                 {
                     Console.WriteLine("  fstEnum.next prefix=" + InputToString(inputMode, current.Input, false) + " output=" + outputs.OutputToString(current.Output));

diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs b/src/Lucene.Net.Tests.Analysis.Kuromoji/Dict/TestTokenInfoDictionary.cs
@@ -41,8 +41,9 @@ public void TestEnumerateAll()
             Int32sRefFSTEnum<J2N.Numerics.Int64> fstEnum = new Int32sRefFSTEnum<J2N.Numerics.Int64>(fst);
             Int32sRefFSTEnum.InputOutput<J2N.Numerics.Int64> mapping;
             Int32sRef scratch = new Int32sRef();
-            while ((mapping = fstEnum.Next()) != null)
+            while (fstEnum.MoveNext())
             {
+                mapping = fstEnum.Current;
                 numTerms++;
                 Int32sRef input = mapping.Input;
                 char[] chars = new char[input.Length];

diff --git a/src/Lucene.Net.Tests/Util/Fst/Test2BFST.cs b/src/Lucene.Net.Tests/Util/Fst/Test2BFST.cs
@@ -112,13 +112,9 @@ public virtual void Test()
                         Arrays.Fill(ints2, 0);
                         r = new J2N.Randomizer(seed);
                         int upto = 0;
-                        while (true)
+                        while (fstEnum.MoveNext())
                         {
-                            Int32sRefFSTEnum.InputOutput<object> pair = fstEnum.Next();
-                            if (pair == null)
-                            {
-                                break;
-                            }
+                            Int32sRefFSTEnum.InputOutput<object> pair = fstEnum.Current;
                             for (int j = 10; j < ints2.Length; j++)
                             {
                                 ints2[j] = r.Next(256);
@@ -201,13 +197,9 @@ public virtual void Test()
                         Arrays.Fill(ints, 0);
                         r = new J2N.Randomizer(seed);
                         int upto = 0;
-                        while (true)
+                        while (fstEnum.MoveNext())
                         {
-                            Int32sRefFSTEnum.InputOutput<BytesRef> pair = fstEnum.Next();
-                            if (pair == null)
-                            {
-                                break;
-                            }
+                            Int32sRefFSTEnum.InputOutput<BytesRef> pair = fstEnum.Current;
                             Assert.AreEqual(input, pair.Input);
                             r.NextBytes(outputBytes);
                             Assert.AreEqual(output, pair.Output);
@@ -294,13 +286,9 @@ public virtual void Test()
                         r = new J2N.Randomizer(seed);
                         int upto = 0;
                         output = 1;
-                        while (true)
+                        while (fstEnum.MoveNext())
                         {
-                            Int32sRefFSTEnum.InputOutput<J2N.Numerics.Int64> pair = fstEnum.Next();
-                            if (pair == null)
-                            {
-                                break;
-                            }
+                            Int32sRefFSTEnum.InputOutput<J2N.Numerics.Int64> pair = fstEnum.Current;
                             Assert.AreEqual(input, pair.Input);
                             Assert.AreEqual(output, pair.Output);
                             output += 1 + r.Next(10);

diff --git a/src/Lucene.Net/Util/Fst/IntsRefFSTEnum.cs b/src/Lucene.Net/Util/Fst/IntsRefFSTEnum.cs
@@ -1,4 +1,5 @@
 using Lucene.Net.Diagnostics;
+using System;
 using System.Runtime.CompilerServices;
 
 namespace Lucene.Net.Util.Fst
@@ -50,6 +51,24 @@ public Int32sRefFSTEnum(FST<T> fst)
 
         public Int32sRefFSTEnum.InputOutput<T> Current => result;
 
+        public bool MoveNext() // LUCENENET specific - replaced Next() with MoveNext()
+        {
+            //System.out.println("  enum.next");
+            DoNext();
+
+            if (m_upto == 0)
+            {
+                return false;
+            }
+            else
+            {
+                current.Length = m_upto - 1;
+                result.Output = m_output[m_upto];
+                return true;
+            }
+        }
+
+        [Obsolete("Use MoveNext() and Current instead. This method will be removed in 4.8.0 release candidate."), System.ComponentModel.EditorBrowsable(System.ComponentModel.EditorBrowsableState.Never)]
         public Int32sRefFSTEnum.InputOutput<T> Next()
         {
             //System.out.println("  enum.next");