Lucene.Net.Analysis.Standard.StandardTokenizerInterface_Fields refactor: renamed StandardTokenizerInterface (after fixing .NET interface name convention, the original name no longer conflicts with the interface)
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/01f01abd Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/01f01abd Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/01f01abd Branch: refs/heads/api-work Commit: 01f01abdae2373f0c419dfa1a982e062ef813540 Parents: e382d8a Author: Shad Storhaug <[email protected]> Authored: Sun Feb 5 01:16:31 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Feb 5 01:16:31 2017 +0700 ---------------------------------------------------------------------- .../Analysis/Standard/ClassicTokenizer.cs | 2 +- .../Analysis/Standard/ClassicTokenizerImpl.cs | 8 ++++---- .../Analysis/Standard/StandardTokenizer.cs | 2 +- .../Analysis/Standard/StandardTokenizerImpl.cs | 8 ++++---- .../Analysis/Standard/StandardTokenizerInterface.cs | 4 ++-- .../Analysis/Standard/Std31/StandardTokenizerImpl31.cs | 2 +- .../Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs | 2 +- .../Analysis/Standard/Std34/StandardTokenizerImpl34.cs | 2 +- .../Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs | 2 +- .../Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs | 2 +- .../Analysis/Standard/Std40/StandardTokenizerImpl40.cs | 2 +- .../Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs | 2 +- .../Analysis/Standard/UAX29URLEmailTokenizer.cs | 2 +- .../Analysis/Standard/UAX29URLEmailTokenizerImpl.cs | 4 ++-- 14 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs index 6898ca6..888615a 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs @@ -153,7 +153,7 @@ namespace Lucene.Net.Analysis.Standard { int tokenType = scanner.GetNextToken(); - if (tokenType == StandardTokenizerInterface_Fields.YYEOF) + if (tokenType == StandardTokenizerInterface.YYEOF) { return false; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs index 7de5f9e..790fa76 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs @@ -695,7 +695,7 @@ namespace Lucene.Net.Analysis.Standard } else if (zzAtEOF) { - zzInput = StandardTokenizerInterface_Fields.YYEOF; + zzInput = StandardTokenizerInterface.YYEOF; goto zzForActionBreak; } else @@ -711,7 +711,7 @@ namespace Lucene.Net.Analysis.Standard zzEndReadL = zzEndRead; if (eof) { - zzInput = StandardTokenizerInterface_Fields.YYEOF; + zzInput = StandardTokenizerInterface.YYEOF; goto zzForActionBreak; } else @@ -808,10 +808,10 @@ namespace Lucene.Net.Analysis.Standard case 20: break; default: - if (zzInput == StandardTokenizerInterface_Fields.YYEOF && zzStartRead == zzCurrentPos) + if (zzInput == StandardTokenizerInterface.YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } else { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs index dfc5ce9..c83e1e5 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs @@ -204,7 +204,7 @@ namespace Lucene.Net.Analysis.Standard { int tokenType = scanner.GetNextToken(); - if (tokenType == StandardTokenizerInterface_Fields.YYEOF) + if (tokenType == StandardTokenizerInterface.YYEOF) { return false; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs index 62e0237..aa66336 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs @@ -1292,7 +1292,7 @@ namespace Lucene.Net.Analysis.Standard } else if (zzAtEOF) { - zzInput = StandardTokenizerInterface_Fields.YYEOF; + zzInput = StandardTokenizerInterface.YYEOF; goto zzForActionBreak; } else @@ -1308,7 +1308,7 @@ namespace Lucene.Net.Analysis.Standard zzEndReadL = zzEndRead; if (eof) { - zzInput = StandardTokenizerInterface_Fields.YYEOF; + zzInput = StandardTokenizerInterface.YYEOF; goto zzForActionBreak; } else @@ -1393,11 +1393,11 @@ namespace Lucene.Net.Analysis.Standard case 16: break; default: - if (zzInput == StandardTokenizerInterface_Fields.YYEOF && zzStartRead == zzCurrentPos) + if (zzInput == StandardTokenizerInterface.YYEOF && zzStartRead == zzCurrentPos) { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs index bfd4f1f..c750d7a 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs @@ -56,12 +56,12 @@ namespace Lucene.Net.Analysis.Standard /// Resumes scanning until the next regular expression is matched, /// the end of input is encountered or an I/O-Error occurs. /// </summary> - /// <returns> the next token, <see cref="StandardTokenizerInterface_Fields.YYEOF"/> on end of stream </returns> + /// <returns> the next token, <see cref="StandardTokenizerInterface.YYEOF"/> on end of stream </returns> /// <exception cref="IOException"> if any I/O-Error occurs </exception> int GetNextToken(); } - public static class StandardTokenizerInterface_Fields // LUCENENET TODO: Rename StandardTokenizerInterface (no longer collides with interface name) + public static class StandardTokenizerInterface { /// <summary> /// This character denotes the end of file </summary> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs index 5e5667f..ececc6e 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs @@ -1097,7 +1097,7 @@ namespace Lucene.Net.Analysis.Standard.Std31 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs index 4fd4938..b5d759f 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs @@ -3658,7 +3658,7 @@ namespace Lucene.Net.Analysis.Standard.Std31 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs index 855470d..4e52f06 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs @@ -1115,7 +1115,7 @@ namespace Lucene.Net.Analysis.Standard.Std34 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs index d774d6d..9bea471 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs @@ -3772,7 +3772,7 @@ namespace Lucene.Net.Analysis.Standard.Std34 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs index afa04ff..2ab6bae 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs @@ -4220,7 +4220,7 @@ namespace Lucene.Net.Analysis.Standard.Std36 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs index 59bd49d..5499abb 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs @@ -1233,7 +1233,7 @@ namespace Lucene.Net.Analysis.Standard.Std40 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs index 3593baa..eabcd40 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs @@ -4438,7 +4438,7 @@ namespace Lucene.Net.Analysis.Standard.Std40 { zzAtEOF = true; { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } } else http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs index 83659e2..32a042c 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs @@ -183,7 +183,7 @@ namespace Lucene.Net.Analysis.Standard { int tokenType = scanner.GetNextToken(); - if (tokenType == StandardTokenizerInterface_Fields.YYEOF) + if (tokenType == StandardTokenizerInterface.YYEOF) { return false; } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/01f01abd/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs index dbf05a7..547a62c 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs @@ -9572,12 +9572,12 @@ namespace Lucene.Net.Analysis.Standard { case YYINITIAL: { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } case 3117: break; case AVOID_BAD_URL: { - return StandardTokenizerInterface_Fields.YYEOF; + return StandardTokenizerInterface.YYEOF; } case 3118: break; default:
