lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [01/50] [abbrv] lucenenet git commit: Lucene.Net.TestFramework.Analysis.LookaheadTokenFilter: renamed End > end because of naming conflict with method
Date Wed, 25 Jan 2017 03:43:45 GMT
Repository: lucenenet
Updated Branches:
  refs/heads/api-work [created] 2315d0d41


Lucene.Net.TestFramework.Analysis.LookaheadTokenFilter: renamed End > end because of naming
conflict with method


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/62edcef3
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/62edcef3
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/62edcef3

Branch: refs/heads/api-work
Commit: 62edcef360d6076a5eeb094598bb62eaacebf34c
Parents: 35f1a4d
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Wed Jan 25 01:40:17 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Wed Jan 25 09:34:44 2017 +0700

----------------------------------------------------------------------
 .../Analysis/LookaheadTokenFilter.cs                      | 10 +++++-----
 .../Analysis/MockGraphTokenFilter.cs                      |  2 +-
 .../Analysis/MockRandomLookaheadTokenFilter.cs            |  4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
index ee840bb..e3a4252 100644
--- a/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/LookaheadTokenFilter.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Analysis
         protected internal int OutputPos;
 
         // True if we hit end from our input:
-        protected internal bool End;
+        protected internal bool end;
 
         private bool TokenPending;
         private bool InsertPending;
@@ -173,7 +173,7 @@ namespace Lucene.Net.Analysis
             {
                 Console.WriteLine("LTF.peekToken inputPos=" + InputPos + " outputPos=" +
OutputPos + " tokenPending=" + TokenPending);
             }
-            Debug.Assert(!End);
+            Debug.Assert(!end);
             Debug.Assert(InputPos == -1 || OutputPos <= InputPos);
             if (TokenPending)
             {
@@ -223,7 +223,7 @@ namespace Lucene.Net.Analysis
             }
             else
             {
-                End = true;
+                end = true;
             }
 
             return gotToken;
@@ -288,7 +288,7 @@ namespace Lucene.Net.Analysis
                         TokenPending = false;
                         return true;
                     }
-                    else if (End || !PeekToken())
+                    else if (end || !PeekToken())
                     {
                         if (DEBUG)
                         {
@@ -368,7 +368,7 @@ namespace Lucene.Net.Analysis
             InputPos = -1;
             OutputPos = 0;
             TokenPending = false;
-            End = false;
+            end = false;
         }
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
index 5db031e..f9d40fa 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockGraphTokenFilter.cs
@@ -71,7 +71,7 @@ namespace Lucene.Net.Analysis
 
                 // Look ahead as needed until we figure out the right
                 // endOffset:
-                while (!End && posEndData.EndOffset == -1 && InputPos <=
(OutputPos + posLength))
+                while (!end && posEndData.EndOffset == -1 && InputPos <=
(OutputPos + posLength))
                 {
                     if (!PeekToken())
                     {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/62edcef3/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
index c4d68ce..9dba8d3 100644
--- a/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.TestFramework/Analysis/MockRandomLookaheadTokenFilter.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Analysis
 
         protected internal override void AfterPosition()
         {
-            if (!End && random.Next(4) == 2)
+            if (!end && random.Next(4) == 2)
             {
                 PeekToken();
             }
@@ -62,7 +62,7 @@ namespace Lucene.Net.Analysis
                 Console.WriteLine("\n" + Thread.CurrentThread.Name + ": MRLTF.incrToken");
             }
 
-            if (!End)
+            if (!end)
             {
                 while (true)
                 {


Mime
View raw message