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 2016/12/06 15:12:20 UTC

[45/58] lucenenet git commit: QueryParser.Flexible refactor: Camel case method names in StandardSyntaxParser and StandardSyntaxParserTokenManager

QueryParser.Flexible refactor: Camel case method names in StandardSyntaxParser and StandardSyntaxParserTokenManager


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

Branch: refs/heads/master
Commit: 3e2eb28f7a29d2a0f930679e8815fb982612cd1c
Parents: 43ec320
Author: Shad Storhaug <sh...@shadstorhaug.com>
Authored: Mon Dec 5 23:58:16 2016 +0700
Committer: Shad Storhaug <sh...@shadstorhaug.com>
Committed: Mon Dec 5 23:58:16 2016 +0700

----------------------------------------------------------------------
 .../Standard/Parser/StandardSyntaxParser.cs     | 268 +++++++++----------
 .../Parser/StandardSyntaxParserTokenManager.cs  | 222 +++++++--------
 2 files changed, 245 insertions(+), 245 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e2eb28f/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 993aa34..bfb5559 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParser.cs
@@ -87,16 +87,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.AND:
-                            jj_consume_token(RegexpToken.AND);
+                            Jj_consume_token(RegexpToken.AND);
                             ret = CONJ_AND;
                             break;
                         case RegexpToken.OR:
-                            jj_consume_token(RegexpToken.OR);
+                            Jj_consume_token(RegexpToken.OR);
                             ret = CONJ_OR;
                             break;
                         default:
                             jj_la1[0] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     break;
@@ -119,20 +119,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.PLUS:
-                            jj_consume_token(RegexpToken.PLUS);
+                            Jj_consume_token(RegexpToken.PLUS);
                             ret = Modifier.MOD_REQ;
                             break;
                         case RegexpToken.MINUS:
-                            jj_consume_token(RegexpToken.MINUS);
+                            Jj_consume_token(RegexpToken.MINUS);
                             ret = Modifier.MOD_NOT;
                             break;
                         case RegexpToken.NOT:
-                            jj_consume_token(RegexpToken.NOT);
+                            Jj_consume_token(RegexpToken.NOT);
                             ret = Modifier.MOD_NOT;
                             break;
                         default:
                             jj_la1[2] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     break;
@@ -149,7 +149,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         {
             IQueryNode q;
             q = Query(field);
-            jj_consume_token(0);
+            Jj_consume_token(0);
             { if (true) return q; }
             throw new Exception("Missing return statement in function");
         }
@@ -227,7 +227,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         jj_la1[5] = jj_gen;
                         goto label_2_break;
                 }
-                jj_consume_token(RegexpToken.OR);
+                Jj_consume_token(RegexpToken.OR);
                 c = ConjQuery(field);
                 if (clauses == null)
                 {
@@ -265,7 +265,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         jj_la1[6] = jj_gen;
                         goto label_3_break;
                 }
-                jj_consume_token(RegexpToken.AND);
+                Jj_consume_token(RegexpToken.AND);
                 c = ModClause(field);
                 if (clauses == null)
                 {
@@ -346,9 +346,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             bool lowerInclusive, upperInclusive;
 
             bool group = false;
-            if (jj_2_2(3))
+            if (Jj_2_2(3))
             {
-                fieldToken = jj_consume_token(RegexpToken.TERM);
+                fieldToken = Jj_consume_token(RegexpToken.TERM);
                 switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                 {
                     case RegexpToken.OP_COLON:
@@ -356,14 +356,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                         {
                             case RegexpToken.OP_COLON:
-                                jj_consume_token(RegexpToken.OP_COLON);
+                                Jj_consume_token(RegexpToken.OP_COLON);
                                 break;
                             case RegexpToken.OP_EQUAL:
-                                jj_consume_token(RegexpToken.OP_EQUAL);
+                                Jj_consume_token(RegexpToken.OP_EQUAL);
                                 break;
                             default:
                                 jj_la1[7] = jj_gen;
-                                jj_consume_token(-1);
+                                Jj_consume_token(-1);
                                 throw new ParseException();
                         }
                         field = EscapeQuerySyntaxImpl.DiscardEscapeChar(fieldToken.image).ToString();
@@ -376,37 +376,37 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                         {
                             case RegexpToken.OP_LESSTHAN:
-                                @operator = jj_consume_token(RegexpToken.OP_LESSTHAN);
+                                @operator = Jj_consume_token(RegexpToken.OP_LESSTHAN);
                                 break;
                             case RegexpToken.OP_LESSTHANEQ:
-                                @operator = jj_consume_token(RegexpToken.OP_LESSTHANEQ);
+                                @operator = Jj_consume_token(RegexpToken.OP_LESSTHANEQ);
                                 break;
                             case RegexpToken.OP_MORETHAN:
-                                @operator = jj_consume_token(RegexpToken.OP_MORETHAN);
+                                @operator = Jj_consume_token(RegexpToken.OP_MORETHAN);
                                 break;
                             case RegexpToken.OP_MORETHANEQ:
-                                @operator = jj_consume_token(RegexpToken.OP_MORETHANEQ);
+                                @operator = Jj_consume_token(RegexpToken.OP_MORETHANEQ);
                                 break;
                             default:
                                 jj_la1[8] = jj_gen;
-                                jj_consume_token(-1);
+                                Jj_consume_token(-1);
                                 throw new ParseException();
                         }
                         field = EscapeQuerySyntaxImpl.DiscardEscapeChar(fieldToken.image).ToString();
                         switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                         {
                             case RegexpToken.TERM:
-                                term = jj_consume_token(RegexpToken.TERM);
+                                term = Jj_consume_token(RegexpToken.TERM);
                                 break;
                             case RegexpToken.QUOTED:
-                                term = jj_consume_token(RegexpToken.QUOTED);
+                                term = Jj_consume_token(RegexpToken.QUOTED);
                                 break;
                             case RegexpToken.NUMBER:
-                                term = jj_consume_token(RegexpToken.NUMBER);
+                                term = Jj_consume_token(RegexpToken.NUMBER);
                                 break;
                             default:
                                 jj_la1[9] = jj_gen;
-                                jj_consume_token(-1);
+                                Jj_consume_token(-1);
                                 throw new ParseException();
                         }
                         if (term.kind == RegexpToken.QUOTED)
@@ -459,7 +459,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         break;
                     default:
                         jj_la1[10] = jj_gen;
-                        jj_consume_token(-1);
+                        Jj_consume_token(-1);
                         throw new ParseException();
                 }
             }
@@ -474,20 +474,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     case RegexpToken.RANGEIN_START:
                     case RegexpToken.RANGEEX_START:
                     case RegexpToken.NUMBER:
-                        if (jj_2_1(2))
+                        if (Jj_2_1(2))
                         {
-                            fieldToken = jj_consume_token(RegexpToken.TERM);
+                            fieldToken = Jj_consume_token(RegexpToken.TERM);
                             switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                             {
                                 case RegexpToken.OP_COLON:
-                                    jj_consume_token(RegexpToken.OP_COLON);
+                                    Jj_consume_token(RegexpToken.OP_COLON);
                                     break;
                                 case RegexpToken.OP_EQUAL:
-                                    jj_consume_token(RegexpToken.OP_EQUAL);
+                                    Jj_consume_token(RegexpToken.OP_EQUAL);
                                     break;
                                 default:
                                     jj_la1[11] = jj_gen;
-                                    jj_consume_token(-1);
+                                    Jj_consume_token(-1);
                                     throw new ParseException();
                             }
                             field = EscapeQuerySyntaxImpl.DiscardEscapeChar(fieldToken.image).ToString();
@@ -507,14 +507,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 q = Term(field);
                                 break;
                             case RegexpToken.LPAREN:
-                                jj_consume_token(RegexpToken.LPAREN);
+                                Jj_consume_token(RegexpToken.LPAREN);
                                 q = Query(field);
-                                jj_consume_token(RegexpToken.RPAREN);
+                                Jj_consume_token(RegexpToken.RPAREN);
                                 switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                                 {
                                     case RegexpToken.CARAT:
-                                        jj_consume_token(RegexpToken.CARAT);
-                                        boost = jj_consume_token(RegexpToken.NUMBER);
+                                        Jj_consume_token(RegexpToken.CARAT);
+                                        boost = Jj_consume_token(RegexpToken.NUMBER);
                                         break;
                                     default:
                                         jj_la1[12] = jj_gen;
@@ -524,13 +524,13 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 break;
                             default:
                                 jj_la1[13] = jj_gen;
-                                jj_consume_token(-1);
+                                Jj_consume_token(-1);
                                 throw new ParseException();
                         }
                         break;
                     default:
                         jj_la1[14] = jj_gen;
-                        jj_consume_token(-1);
+                        Jj_consume_token(-1);
                         throw new ParseException();
                 }
             }
@@ -580,25 +580,25 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.TERM:
-                            term = jj_consume_token(RegexpToken.TERM);
+                            term = Jj_consume_token(RegexpToken.TERM);
                             q = new FieldQueryNode(field, EscapeQuerySyntaxImpl.DiscardEscapeChar(term.image), term.beginColumn, term.endColumn);
                             break;
                         case RegexpToken.REGEXPTERM:
-                            term = jj_consume_token(RegexpToken.REGEXPTERM);
+                            term = Jj_consume_token(RegexpToken.REGEXPTERM);
                             regexp = true;
                             break;
                         case RegexpToken.NUMBER:
-                            term = jj_consume_token(RegexpToken.NUMBER);
+                            term = Jj_consume_token(RegexpToken.NUMBER);
                             break;
                         default:
                             jj_la1[15] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.FUZZY_SLOP:
-                            fuzzySlop = jj_consume_token(RegexpToken.FUZZY_SLOP);
+                            fuzzySlop = Jj_consume_token(RegexpToken.FUZZY_SLOP);
                             fuzzy = true;
                             break;
                         default:
@@ -608,12 +608,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.CARAT:
-                            jj_consume_token(RegexpToken.CARAT);
-                            boost = jj_consume_token(RegexpToken.NUMBER);
+                            Jj_consume_token(RegexpToken.CARAT);
+                            boost = Jj_consume_token(RegexpToken.NUMBER);
                             switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                             {
                                 case RegexpToken.FUZZY_SLOP:
-                                    fuzzySlop = jj_consume_token(RegexpToken.FUZZY_SLOP);
+                                    fuzzySlop = Jj_consume_token(RegexpToken.FUZZY_SLOP);
                                     fuzzy = true;
                                     break;
                                 default:
@@ -656,34 +656,34 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.RANGEIN_START:
-                            jj_consume_token(RegexpToken.RANGEIN_START);
+                            Jj_consume_token(RegexpToken.RANGEIN_START);
                             startInc = true;
                             break;
                         case RegexpToken.RANGEEX_START:
-                            jj_consume_token(RegexpToken.RANGEEX_START);
+                            Jj_consume_token(RegexpToken.RANGEEX_START);
                             break;
                         default:
                             jj_la1[19] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.RANGE_GOOP:
-                            goop1 = jj_consume_token(RegexpToken.RANGE_GOOP);
+                            goop1 = Jj_consume_token(RegexpToken.RANGE_GOOP);
                             break;
                         case RegexpToken.RANGE_QUOTED:
-                            goop1 = jj_consume_token(RegexpToken.RANGE_QUOTED);
+                            goop1 = Jj_consume_token(RegexpToken.RANGE_QUOTED);
                             break;
                         default:
                             jj_la1[20] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.RANGE_TO:
-                            jj_consume_token(RegexpToken.RANGE_TO);
+                            Jj_consume_token(RegexpToken.RANGE_TO);
                             break;
                         default:
                             jj_la1[21] = jj_gen;
@@ -692,35 +692,35 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.RANGE_GOOP:
-                            goop2 = jj_consume_token(RegexpToken.RANGE_GOOP);
+                            goop2 = Jj_consume_token(RegexpToken.RANGE_GOOP);
                             break;
                         case RegexpToken.RANGE_QUOTED:
-                            goop2 = jj_consume_token(RegexpToken.RANGE_QUOTED);
+                            goop2 = Jj_consume_token(RegexpToken.RANGE_QUOTED);
                             break;
                         default:
                             jj_la1[22] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.RANGEIN_END:
-                            jj_consume_token(RegexpToken.RANGEIN_END);
+                            Jj_consume_token(RegexpToken.RANGEIN_END);
                             endInc = true;
                             break;
                         case RegexpToken.RANGEEX_END:
-                            jj_consume_token(RegexpToken.RANGEEX_END);
+                            Jj_consume_token(RegexpToken.RANGEEX_END);
                             break;
                         default:
                             jj_la1[23] = jj_gen;
-                            jj_consume_token(-1);
+                            Jj_consume_token(-1);
                             throw new ParseException();
                     }
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.CARAT:
-                            jj_consume_token(RegexpToken.CARAT);
-                            boost = jj_consume_token(RegexpToken.NUMBER);
+                            Jj_consume_token(RegexpToken.CARAT);
+                            boost = Jj_consume_token(RegexpToken.NUMBER);
                             break;
                         default:
                             jj_la1[24] = jj_gen;
@@ -742,12 +742,12 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     q = new TermRangeQueryNode(qLower, qUpper, startInc ? true : false, endInc ? true : false);
                     break;
                 case RegexpToken.QUOTED:
-                    term = jj_consume_token(RegexpToken.QUOTED);
+                    term = Jj_consume_token(RegexpToken.QUOTED);
                     q = new QuotedFieldQueryNode(field, EscapeQuerySyntaxImpl.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:
-                            fuzzySlop = jj_consume_token(RegexpToken.FUZZY_SLOP);
+                            fuzzySlop = Jj_consume_token(RegexpToken.FUZZY_SLOP);
                             break;
                         default:
                             jj_la1[25] = jj_gen;
@@ -756,8 +756,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     switch ((jj_ntk == -1) ? Jj_ntk() : jj_ntk)
                     {
                         case RegexpToken.CARAT:
-                            jj_consume_token(RegexpToken.CARAT);
-                            boost = jj_consume_token(RegexpToken.NUMBER);
+                            Jj_consume_token(RegexpToken.CARAT);
+                            boost = Jj_consume_token(RegexpToken.NUMBER);
                             break;
                         default:
                             jj_la1[26] = jj_gen;
@@ -784,7 +784,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     break;
                 default:
                     jj_la1[27] = jj_gen;
-                    jj_consume_token(-1);
+                    Jj_consume_token(-1);
                     throw new ParseException();
             }
             if (boost != null)
@@ -812,158 +812,158 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             throw new Exception("Missing return statement in function");
         }
 
-        private bool jj_2_1(int xla)
+        private bool Jj_2_1(int xla)
         {
             jj_la = xla; jj_lastpos = jj_scanpos = token;
-            try { return !jj_3_1(); }
+            try { return !Jj_3_1(); }
 #pragma warning disable 168
             catch (LookaheadSuccess ls) { return true; }
 #pragma warning restore 168
-            finally { jj_save(0, xla); }
+            finally { Jj_save(0, xla); }
         }
 
-        private bool jj_2_2(int xla)
+        private bool Jj_2_2(int xla)
         {
             jj_la = xla; jj_lastpos = jj_scanpos = token;
-            try { return !jj_3_2(); }
+            try { return !Jj_3_2(); }
 #pragma warning disable 168
             catch (LookaheadSuccess ls) { return true; }
 #pragma warning restore 168
-            finally { jj_save(1, xla); }
+            finally { Jj_save(1, xla); }
         }
 
-        private bool jj_3_2()
+        private bool Jj_3_2()
         {
-            if (jj_scan_token(RegexpToken.TERM)) return true;
+            if (Jj_scan_token(RegexpToken.TERM)) return true;
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_3R_4())
+            if (Jj_3R_4())
             {
                 jj_scanpos = xsp;
-                if (jj_3R_5()) return true;
+                if (Jj_3R_5()) return true;
             }
             return false;
         }
 
-        private bool jj_3R_12()
+        private bool Jj_3R_12()
         {
-            if (jj_scan_token(RegexpToken.RANGEIN_START)) return true;
+            if (Jj_scan_token(RegexpToken.RANGEIN_START)) return true;
             return false;
         }
 
-        private bool jj_3R_11()
+        private bool Jj_3R_11()
         {
-            if (jj_scan_token(RegexpToken.REGEXPTERM)) return true;
+            if (Jj_scan_token(RegexpToken.REGEXPTERM)) return true;
             return false;
         }
 
-        private bool jj_3_1()
+        private bool Jj_3_1()
         {
-            if (jj_scan_token(RegexpToken.TERM)) return true;
+            if (Jj_scan_token(RegexpToken.TERM)) return true;
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_scan_token(15))
+            if (Jj_scan_token(15))
             {
                 jj_scanpos = xsp;
-                if (jj_scan_token(16)) return true;
+                if (Jj_scan_token(16)) return true;
             }
             return false;
         }
 
-        private bool jj_3R_8()
+        private bool Jj_3R_8()
         {
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_3R_12())
+            if (Jj_3R_12())
             {
                 jj_scanpos = xsp;
-                if (jj_scan_token(27)) return true;
+                if (Jj_scan_token(27)) return true;
             }
             return false;
         }
 
-        private bool jj_3R_10()
+        private bool Jj_3R_10()
         {
-            if (jj_scan_token(RegexpToken.TERM)) return true;
+            if (Jj_scan_token(RegexpToken.TERM)) return true;
             return false;
         }
 
-        private bool jj_3R_7()
+        private bool Jj_3R_7()
         {
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_3R_10())
+            if (Jj_3R_10())
             {
                 jj_scanpos = xsp;
-                if (jj_3R_11())
+                if (Jj_3R_11())
                 {
                     jj_scanpos = xsp;
-                    if (jj_scan_token(28)) return true;
+                    if (Jj_scan_token(28)) return true;
                 }
             }
             return false;
         }
 
-        private bool jj_3R_9()
+        private bool Jj_3R_9()
         {
-            if (jj_scan_token(RegexpToken.QUOTED)) return true;
+            if (Jj_scan_token(RegexpToken.QUOTED)) return true;
             return false;
         }
 
-        private bool jj_3R_5()
+        private bool Jj_3R_5()
         {
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_scan_token(17))
+            if (Jj_scan_token(17))
             {
                 jj_scanpos = xsp;
-                if (jj_scan_token(18))
+                if (Jj_scan_token(18))
                 {
                     jj_scanpos = xsp;
-                    if (jj_scan_token(19))
+                    if (Jj_scan_token(19))
                     {
                         jj_scanpos = xsp;
-                        if (jj_scan_token(20)) return true;
+                        if (Jj_scan_token(20)) return true;
                     }
                 }
             }
             xsp = jj_scanpos;
-            if (jj_scan_token(23))
+            if (Jj_scan_token(23))
             {
                 jj_scanpos = xsp;
-                if (jj_scan_token(22))
+                if (Jj_scan_token(22))
                 {
                     jj_scanpos = xsp;
-                    if (jj_scan_token(28)) return true;
+                    if (Jj_scan_token(28)) return true;
                 }
             }
             return false;
         }
 
-        private bool jj_3R_4()
+        private bool Jj_3R_4()
         {
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_scan_token(15))
+            if (Jj_scan_token(15))
             {
                 jj_scanpos = xsp;
-                if (jj_scan_token(16)) return true;
+                if (Jj_scan_token(16)) return true;
             }
-            if (jj_3R_6()) return true;
+            if (Jj_3R_6()) return true;
             return false;
         }
 
-        private bool jj_3R_6()
+        private bool Jj_3R_6()
         {
             Token xsp;
             xsp = jj_scanpos;
-            if (jj_3R_7())
+            if (Jj_3R_7())
             {
                 jj_scanpos = xsp;
-                if (jj_3R_8())
+                if (Jj_3R_8())
                 {
                     jj_scanpos = xsp;
-                    if (jj_3R_9()) return true;
+                    if (Jj_3R_9()) return true;
                 }
             }
             return false;
@@ -984,14 +984,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         static private int[] jj_la1_1;
         static StandardSyntaxParser()
         {
-            jj_la1_init_0();
-            jj_la1_init_1();
+            Jj_la1_init_0();
+            Jj_la1_init_1();
         }
-        private static void jj_la1_init_0()
+        private static void Jj_la1_init_0()
         {
             jj_la1_0 = new uint[] { 0x300, 0x300, 0x1c00, 0x1c00, 0x1ec03c00, 0x200, 0x100, 0x18000, 0x1e0000, 0x10c00000, 0x1f8000, 0x18000, 0x200000, 0x1ec02000, 0x1ec02000, 0x12800000, 0x1000000, 0x1000000, 0x200000, 0xc000000, 0x0, 0x20000000, 0x0, 0xc0000000, 0x200000, 0x1000000, 0x200000, 0x1ec00000, };
         }
-        private static void jj_la1_init_1()
+        private static void Jj_la1_init_1()
         {
             jj_la1_1 = new int[] { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, };
         }
@@ -1045,11 +1045,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             for (int i = 0; i < jj_2_rtns.Length; i++) jj_2_rtns[i] = new JJCalls();
         }
 
-        private Token jj_consume_token(int kind)
+        private Token Jj_consume_token(int kind)
         {
             Token oldToken;
             if ((oldToken = token).next != null) token = token.next;
-            else token = token.next = token_source.getNextToken();
+            else token = token.next = token_source.GetNextToken();
             jj_ntk = -1;
             if (token.kind == kind)
             {
@@ -1071,19 +1071,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             }
             token = oldToken;
             jj_kind = kind;
-            throw generateParseException();
+            throw GenerateParseException();
         }
 
         internal sealed class LookaheadSuccess : Exception { }
         readonly private LookaheadSuccess jj_ls = new LookaheadSuccess();
-        private bool jj_scan_token(int kind)
+        private bool Jj_scan_token(int kind)
         {
             if (jj_scanpos == jj_lastpos)
             {
                 jj_la--;
                 if (jj_scanpos.next == null)
                 {
-                    jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+                    jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.GetNextToken();
                 }
                 else
                 {
@@ -1098,7 +1098,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             {
                 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 (tok != null) Jj_add_error_token(kind, i);
             }
             if (jj_scanpos.kind != kind) return true;
             if (jj_la == 0 && jj_scanpos == jj_lastpos) throw jj_ls;
@@ -1107,23 +1107,23 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 
 
         /// <summary>Get the next Token.</summary>
-        public Token getNextToken()
+        public Token GetNextToken()
         {
             if (token.next != null) token = token.next;
-            else token = token.next = token_source.getNextToken();
+            else token = token.next = token_source.GetNextToken();
             jj_ntk = -1;
             jj_gen++;
             return token;
         }
 
         /// <summary>Get the specific Token.</summary>
-        public Token getToken(int index)
+        public Token GetToken(int index)
         {
             Token t = token;
             for (int i = 0; i < index; i++)
             {
                 if (t.next != null) t = t.next;
-                else t = t.next = token_source.getNextToken();
+                else t = t.next = token_source.GetNextToken();
             }
             return t;
         }
@@ -1131,7 +1131,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         private int Jj_ntk()
         {
             if ((jj_nt = token.next) == null)
-                return (jj_ntk = (token.next = token_source.getNextToken()).kind);
+                return (jj_ntk = (token.next = token_source.GetNextToken()).kind);
             else
                 return (jj_ntk = jj_nt.kind);
         }
@@ -1142,7 +1142,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         private int[] jj_lasttokens = new int[100];
         private int jj_endpos;
 
-        private void jj_add_error_token(int kind, int pos)
+        private void Jj_add_error_token(int kind, int pos)
         {
             if (pos >= 100) return;
             if (pos == jj_endpos + 1)
@@ -1179,7 +1179,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         }
 
         /// <summary>Generate ParseException.</summary>
-        public virtual ParseException generateParseException()
+        public virtual ParseException GenerateParseException()
         {
             jj_expentries.Clear();
             bool[] la1tokens = new bool[34];
@@ -1215,8 +1215,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                 }
             }
             jj_endpos = 0;
-            jj_rescan_token();
-            jj_add_error_token(0, 0);
+            Jj_rescan_token();
+            Jj_add_error_token(0, 0);
             int[][] exptokseq = new int[jj_expentries.Count][];
             for (int i = 0; i < jj_expentries.Count; i++)
             {
@@ -1226,16 +1226,16 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         }
 
         /// <summary>Enable tracing.</summary>
-        public void enable_tracing()
+        public void Enable_tracing()
         {
         }
 
         /// <summary>Disable tracing.</summary>
-        public void disable_tracing()
+        public void Disable_tracing()
         {
         }
 
-        private void jj_rescan_token()
+        private void Jj_rescan_token()
         {
             jj_rescan = true;
             for (int i = 0; i < 2; i++)
@@ -1250,8 +1250,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                             jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
                             switch (i)
                             {
-                                case 0: jj_3_1(); break;
-                                case 1: jj_3_2(); break;
+                                case 0: Jj_3_1(); break;
+                                case 1: Jj_3_2(); break;
                             }
                         }
                         p = p.next;
@@ -1264,7 +1264,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             jj_rescan = false;
         }
 
-        private void jj_save(int index, int xla)
+        private void Jj_save(int index, int xla)
         {
             JJCalls p = jj_2_rtns[index];
             while (p.gen > jj_gen)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3e2eb28f/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 73ce875..9c057f4 100644
--- a/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
+++ b/src/Lucene.Net.QueryParser/Flexible/Standard/Parser/StandardSyntaxParserTokenManager.cs
@@ -28,8 +28,8 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         /// <summary>Debug output.</summary>
         public TextWriter debugStream = Console.Out;
         /// <summary>Set debug output.</summary>
-        public void setDebugStream(TextWriter ds) { debugStream = ds; }
-        private int jjStopStringLiteralDfa_2(int pos, long active0)
+        public void SetDebugStream(TextWriter ds) { debugStream = ds; }
+        private int JjStopStringLiteralDfa_2(int pos, long active0)
         {
             switch (pos)
             {
@@ -37,70 +37,70 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     return -1;
             }
         }
-        private int jjStartNfa_2(int pos, long active0)
+        private int JjStartNfa_2(int pos, long active0)
         {
-            return jjMoveNfa_2(jjStopStringLiteralDfa_2(pos, active0), pos + 1);
+            return JjMoveNfa_2(JjStopStringLiteralDfa_2(pos, active0), pos + 1);
         }
-        private int jjStopAtPos(int pos, int kind)
+        private int JjStopAtPos(int pos, int kind)
         {
             jjmatchedKind = kind;
             jjmatchedPos = pos;
             return pos + 1;
         }
-        private int jjMoveStringLiteralDfa0_2()
+        private int JjMoveStringLiteralDfa0_2()
         {
             switch ((int)curChar)
             {
                 case 40:
-                    return jjStopAtPos(0, 13);
+                    return JjStopAtPos(0, 13);
                 case 41:
-                    return jjStopAtPos(0, 14);
+                    return JjStopAtPos(0, 14);
                 case 43:
-                    return jjStopAtPos(0, 11);
+                    return JjStopAtPos(0, 11);
                 case 45:
-                    return jjStopAtPos(0, 12);
+                    return JjStopAtPos(0, 12);
                 case 58:
-                    return jjStopAtPos(0, 15);
+                    return JjStopAtPos(0, 15);
                 case 60:
                     jjmatchedKind = 17;
-                    return jjMoveStringLiteralDfa1_2(0x40000L);
+                    return JjMoveStringLiteralDfa1_2(0x40000L);
                 case 61:
-                    return jjStopAtPos(0, 16);
+                    return JjStopAtPos(0, 16);
                 case 62:
                     jjmatchedKind = 19;
-                    return jjMoveStringLiteralDfa1_2(0x100000L);
+                    return JjMoveStringLiteralDfa1_2(0x100000L);
                 case 91:
-                    return jjStopAtPos(0, 26);
+                    return JjStopAtPos(0, 26);
                 case 94:
-                    return jjStopAtPos(0, 21);
+                    return JjStopAtPos(0, 21);
                 case 123:
-                    return jjStopAtPos(0, 27);
+                    return JjStopAtPos(0, 27);
                 default:
-                    return jjMoveNfa_2(0, 0);
+                    return JjMoveNfa_2(0, 0);
             }
         }
-        private int jjMoveStringLiteralDfa1_2(long active0)
+        private int JjMoveStringLiteralDfa1_2(long active0)
         {
             try { curChar = input_stream.ReadChar(); }
 #pragma warning disable 168
             catch (IOException e)
 #pragma warning restore 168
             {
-                jjStopStringLiteralDfa_2(0, active0);
+                JjStopStringLiteralDfa_2(0, active0);
                 return 1;
             }
             switch ((int)curChar)
             {
                 case 61:
                     if ((active0 & 0x40000L) != 0L)
-                        return jjStopAtPos(1, 18);
+                        return JjStopAtPos(1, 18);
                     else if ((active0 & 0x100000L) != 0L)
-                        return jjStopAtPos(1, 20);
+                        return JjStopAtPos(1, 20);
                     break;
                 default:
                     break;
             }
-            return jjStartNfa_2(0, active0);
+            return JjStartNfa_2(0, active0);
         }
         internal static readonly ulong[] jjbitVec0 = {
            0x1L, 0x0L, 0x0L, 0x0L
@@ -114,7 +114,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         internal static readonly ulong[] jjbitVec4 = {
            0xfffefffffffffffeL, 0xffffffffffffffffL, 0xffffffffffffffffL, 0xffffffffffffffffL
         };
-        private int jjMoveNfa_2(int startState, int curPos)
+        private int JjMoveNfa_2(int startState, int curPos)
         {
             int startsAt = 0;
             jjnewStateCnt = 33;
@@ -137,7 +137,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 {
                                     if (kind > 23)
                                         kind = 23;
-                                    jjCheckNAddTwoStates(20, 21);
+                                    JjCheckNAddTwoStates(20, 21);
                                 }
                                 else if ((0x100002600L & l) != 0L)
                                 {
@@ -145,9 +145,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                         kind = 7;
                                 }
                                 else if (curChar == 47)
-                                    jjCheckNAddStates(0, 2);
+                                    JjCheckNAddStates(0, 2);
                                 else if (curChar == 34)
-                                    jjCheckNAddStates(3, 5);
+                                    JjCheckNAddStates(3, 5);
                                 else if (curChar == 33)
                                 {
                                     if (kind > 10)
@@ -170,14 +170,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 break;
                             case 14:
                                 if (curChar == 34)
-                                    jjCheckNAddStates(3, 5);
+                                    JjCheckNAddStates(3, 5);
                                 break;
                             case 15:
                                 if ((0xfffffffbffffffffL & l) != 0L)
-                                    jjCheckNAddStates(3, 5);
+                                    JjCheckNAddStates(3, 5);
                                 break;
                             case 17:
-                                jjCheckNAddStates(3, 5);
+                                JjCheckNAddStates(3, 5);
                                 break;
                             case 18:
                                 if (curChar == 34 && kind > 22)
@@ -188,46 +188,46 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     break;
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 20:
                                 if ((0x8bff7cf8ffffd9ffL & l) == 0L)
                                     break;
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 22:
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 25:
                                 if ((0x3ff000000000000L & l) == 0L)
                                     break;
                                 if (kind > 24)
                                     kind = 24;
-                                jjAddStates(6, 7);
+                                JjAddStates(6, 7);
                                 break;
                             case 26:
                                 if (curChar == 46)
-                                    jjCheckNAdd(27);
+                                    JjCheckNAdd(27);
                                 break;
                             case 27:
                                 if ((0x3ff000000000000L & l) == 0L)
                                     break;
                                 if (kind > 24)
                                     kind = 24;
-                                jjCheckNAdd(27);
+                                JjCheckNAdd(27);
                                 break;
                             case 28:
                             case 30:
                                 if (curChar == 47)
-                                    jjCheckNAddStates(0, 2);
+                                    JjCheckNAddStates(0, 2);
                                 break;
                             case 29:
                                 if ((0xffff7fffffffffffL & l) != 0L)
-                                    jjCheckNAddStates(0, 2);
+                                    JjCheckNAddStates(0, 2);
                                 break;
                             case 32:
                                 if (curChar == 47 && kind > 25)
@@ -250,7 +250,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 {
                                     if (kind > 23)
                                         kind = 23;
-                                    jjCheckNAddTwoStates(20, 21);
+                                    JjCheckNAddTwoStates(20, 21);
                                 }
                                 else if (curChar == 126)
                                 {
@@ -259,7 +259,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     jjstateSet[jjnewStateCnt++] = 25;
                                 }
                                 else if (curChar == 92)
-                                    jjCheckNAdd(22);
+                                    JjCheckNAdd(22);
                                 if (curChar == 78)
                                     jjstateSet[jjnewStateCnt++] = 11;
                                 else if (curChar == 124)
@@ -311,14 +311,14 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 break;
                             case 15:
                                 if ((0xffffffffefffffffL & l) != 0L)
-                                    jjCheckNAddStates(3, 5);
+                                    JjCheckNAddStates(3, 5);
                                 break;
                             case 16:
                                 if (curChar == 92)
                                     jjstateSet[jjnewStateCnt++] = 17;
                                 break;
                             case 17:
-                                jjCheckNAddStates(3, 5);
+                                JjCheckNAddStates(3, 5);
                                 break;
                             case 19:
                             case 20:
@@ -326,20 +326,20 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     break;
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 21:
                                 if (curChar == 92)
-                                    jjCheckNAddTwoStates(22, 22);
+                                    JjCheckNAddTwoStates(22, 22);
                                 break;
                             case 22:
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 23:
                                 if (curChar == 92)
-                                    jjCheckNAdd(22);
+                                    JjCheckNAdd(22);
                                 break;
                             case 24:
                                 if (curChar != 126)
@@ -349,7 +349,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 jjstateSet[jjnewStateCnt++] = 25;
                                 break;
                             case 29:
-                                jjAddStates(0, 2);
+                                JjAddStates(0, 2);
                                 break;
                             case 31:
                                 if (curChar == 92)
@@ -373,41 +373,41 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         switch (jjstateSet[--i])
                         {
                             case 0:
-                                if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                if (JjCanMove_0(hiByte, i1, i2, l1, l2))
                                 {
                                     if (kind > 7)
                                         kind = 7;
                                 }
-                                if (jjCanMove_2(hiByte, i1, i2, l1, l2))
+                                if (JjCanMove_2(hiByte, i1, i2, l1, l2))
                                 {
                                     if (kind > 23)
                                         kind = 23;
-                                    jjCheckNAddTwoStates(20, 21);
+                                    JjCheckNAddTwoStates(20, 21);
                                 }
                                 break;
                             case 15:
                             case 17:
-                                if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                                    jjCheckNAddStates(3, 5);
+                                if (JjCanMove_1(hiByte, i1, i2, l1, l2))
+                                    JjCheckNAddStates(3, 5);
                                 break;
                             case 19:
                             case 20:
-                                if (!jjCanMove_2(hiByte, i1, i2, l1, l2))
+                                if (!JjCanMove_2(hiByte, i1, i2, l1, l2))
                                     break;
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 22:
-                                if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+                                if (!JjCanMove_1(hiByte, i1, i2, l1, l2))
                                     break;
                                 if (kind > 23)
                                     kind = 23;
-                                jjCheckNAddTwoStates(20, 21);
+                                JjCheckNAddTwoStates(20, 21);
                                 break;
                             case 29:
-                                if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                                    jjAddStates(0, 2);
+                                if (JjCanMove_1(hiByte, i1, i2, l1, l2))
+                                    JjAddStates(0, 2);
                                 break;
                             default: break;
                         }
@@ -428,11 +428,11 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 #pragma warning restore 168
             }
         }
-        private int jjMoveStringLiteralDfa0_0()
+        private int JjMoveStringLiteralDfa0_0()
         {
-            return jjMoveNfa_0(0, 0);
+            return JjMoveNfa_0(0, 0);
         }
-        private int jjMoveNfa_0(int startState, int curPos)
+        private int JjMoveNfa_0(int startState, int curPos)
         {
             int startsAt = 0;
             jjnewStateCnt = 3;
@@ -455,18 +455,18 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     break;
                                 if (kind > 28)
                                     kind = 28;
-                                jjAddStates(8, 9);
+                                JjAddStates(8, 9);
                                 break;
                             case 1:
                                 if (curChar == 46)
-                                    jjCheckNAdd(2);
+                                    JjCheckNAdd(2);
                                 break;
                             case 2:
                                 if ((0x3ff000000000000L & l) == 0L)
                                     break;
                                 if (kind > 28)
                                     kind = 28;
-                                jjCheckNAdd(2);
+                                JjCheckNAdd(2);
                                 break;
                             default: break;
                         }
@@ -516,7 +516,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 #pragma warning restore 168
             }
         }
-        private int jjStopStringLiteralDfa_1(int pos, long active0)
+        private int JjStopStringLiteralDfa_1(int pos, long active0)
         {
             switch (pos)
             {
@@ -531,46 +531,46 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     return -1;
             }
         }
-        private int jjStartNfa_1(int pos, long active0)
+        private int JjStartNfa_1(int pos, long active0)
         {
-            return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
+            return JjMoveNfa_1(JjStopStringLiteralDfa_1(pos, active0), pos + 1);
         }
-        private int jjMoveStringLiteralDfa0_1()
+        private int JjMoveStringLiteralDfa0_1()
         {
             switch ((int)curChar)
             {
                 case 84:
-                    return jjMoveStringLiteralDfa1_1(0x20000000L);
+                    return JjMoveStringLiteralDfa1_1(0x20000000L);
                 case 93:
-                    return jjStopAtPos(0, 30);
+                    return JjStopAtPos(0, 30);
                 case 125:
-                    return jjStopAtPos(0, 31);
+                    return JjStopAtPos(0, 31);
                 default:
-                    return jjMoveNfa_1(0, 0);
+                    return JjMoveNfa_1(0, 0);
             }
         }
-        private int jjMoveStringLiteralDfa1_1(long active0)
+        private int JjMoveStringLiteralDfa1_1(long active0)
         {
             try { curChar = input_stream.ReadChar(); }
 #pragma warning disable 168
             catch (IOException e)
 #pragma warning restore 168
             {
-                jjStopStringLiteralDfa_1(0, active0);
+                JjStopStringLiteralDfa_1(0, active0);
                 return 1;
             }
             switch ((int)curChar)
             {
                 case 79:
                     if ((active0 & 0x20000000L) != 0L)
-                        return jjStartNfaWithStates_1(1, 29, 6);
+                        return JjStartNfaWithStates_1(1, 29, 6);
                     break;
                 default:
                     break;
             }
-            return jjStartNfa_1(0, active0);
+            return JjStartNfa_1(0, active0);
         }
-        private int jjStartNfaWithStates_1(int pos, int kind, int state)
+        private int JjStartNfaWithStates_1(int pos, int kind, int state)
         {
             jjmatchedKind = kind;
             jjmatchedPos = pos;
@@ -578,9 +578,9 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 #pragma warning disable 168
             catch (IOException e) { return pos + 1; }
 #pragma warning restore 168
-            return jjMoveNfa_1(state, pos + 1);
+            return JjMoveNfa_1(state, pos + 1);
         }
-        private int jjMoveNfa_1(int startState, int curPos)
+        private int JjMoveNfa_1(int startState, int curPos)
         {
             int startsAt = 0;
             jjnewStateCnt = 7;
@@ -603,7 +603,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                 {
                                     if (kind > 33)
                                         kind = 33;
-                                    jjCheckNAdd(6);
+                                    JjCheckNAdd(6);
                                 }
                                 if ((0x100002600L & l) != 0L)
                                 {
@@ -611,19 +611,19 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                         kind = 7;
                                 }
                                 else if (curChar == 34)
-                                    jjCheckNAddTwoStates(2, 4);
+                                    JjCheckNAddTwoStates(2, 4);
                                 break;
                             case 1:
                                 if (curChar == 34)
-                                    jjCheckNAddTwoStates(2, 4);
+                                    JjCheckNAddTwoStates(2, 4);
                                 break;
                             case 2:
                                 if ((0xfffffffbffffffffL & l) != 0L)
-                                    jjCheckNAddStates(10, 12);
+                                    JjCheckNAddStates(10, 12);
                                 break;
                             case 3:
                                 if (curChar == 34)
-                                    jjCheckNAddStates(10, 12);
+                                    JjCheckNAddStates(10, 12);
                                 break;
                             case 5:
                                 if (curChar == 34 && kind > 32)
@@ -634,7 +634,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     break;
                                 if (kind > 33)
                                     kind = 33;
-                                jjCheckNAdd(6);
+                                JjCheckNAdd(6);
                                 break;
                             default: break;
                         }
@@ -654,10 +654,10 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                                     break;
                                 if (kind > 33)
                                     kind = 33;
-                                jjCheckNAdd(6);
+                                JjCheckNAdd(6);
                                 break;
                             case 2:
-                                jjAddStates(10, 12);
+                                JjAddStates(10, 12);
                                 break;
                             case 4:
                                 if (curChar == 92)
@@ -681,28 +681,28 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         switch (jjstateSet[--i])
                         {
                             case 0:
-                                if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+                                if (JjCanMove_0(hiByte, i1, i2, l1, l2))
                                 {
                                     if (kind > 7)
                                         kind = 7;
                                 }
-                                if (jjCanMove_1(hiByte, i1, i2, l1, l2))
+                                if (JjCanMove_1(hiByte, i1, i2, l1, l2))
                                 {
                                     if (kind > 33)
                                         kind = 33;
-                                    jjCheckNAdd(6);
+                                    JjCheckNAdd(6);
                                 }
                                 break;
                             case 2:
-                                if (jjCanMove_1(hiByte, i1, i2, l1, l2))
-                                    jjAddStates(10, 12);
+                                if (JjCanMove_1(hiByte, i1, i2, l1, l2))
+                                    JjAddStates(10, 12);
                                 break;
                             case 6:
-                                if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+                                if (!JjCanMove_1(hiByte, i1, i2, l1, l2))
                                     break;
                                 if (kind > 33)
                                     kind = 33;
-                                jjCheckNAdd(6);
+                                JjCheckNAdd(6);
                                 break;
                             default: break;
                         }
@@ -726,7 +726,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         internal static readonly int[] jjnextStates = {
            29, 31, 32, 15, 16, 18, 25, 26, 0, 1, 2, 4, 5,
         };
-        private static bool jjCanMove_0(int hiByte, int i1, int i2, ulong l1, ulong l2)
+        private static bool JjCanMove_0(int hiByte, int i1, int i2, ulong l1, ulong l2)
         {
             switch (hiByte)
             {
@@ -736,7 +736,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     return false;
             }
         }
-        private static bool jjCanMove_1(int hiByte, int i1, int i2, ulong l1, ulong l2)
+        private static bool JjCanMove_1(int hiByte, int i1, int i2, ulong l1, ulong l2)
         {
             switch (hiByte)
             {
@@ -748,7 +748,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     return false;
             }
         }
-        private static bool jjCanMove_2(int hiByte, int i1, int i2, ulong l1, ulong l2)
+        private static bool JjCanMove_2(int hiByte, int i1, int i2, ulong l1, ulong l2)
         {
             switch (hiByte)
             {
@@ -837,7 +837,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                 curLexState = lexState;
         }
 
-        protected Token jjFillToken()
+        protected Token JjFillToken()
         {
             Token t;
             string curTokenImage;
@@ -869,7 +869,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
         internal int jjmatchedKind;
 
         /// <summary>Get the next Token.</summary>
-        public Token getNextToken()
+        public virtual Token GetNextToken()
         {
             Token matchedToken;
             int curPos = 0;
@@ -886,7 +886,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
 #pragma warning restore 168
                 {
                     jjmatchedKind = 0;
-                    matchedToken = jjFillToken();
+                    matchedToken = JjFillToken();
                     return matchedToken;
                 }
 
@@ -895,17 +895,17 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                     case 0:
                         jjmatchedKind = 0x7fffffff;
                         jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_0();
+                        curPos = JjMoveStringLiteralDfa0_0();
                         break;
                     case 1:
                         jjmatchedKind = 0x7fffffff;
                         jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_1();
+                        curPos = JjMoveStringLiteralDfa0_1();
                         break;
                     case 2:
                         jjmatchedKind = 0x7fffffff;
                         jjmatchedPos = 0;
-                        curPos = jjMoveStringLiteralDfa0_2();
+                        curPos = JjMoveStringLiteralDfa0_2();
                         break;
                 }
                 if (jjmatchedKind != 0x7fffffff)
@@ -914,7 +914,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                         input_stream.BackUp(curPos - jjmatchedPos - 1);
                     if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 63 /*077*/))) != 0L)
                     {
-                        matchedToken = jjFillToken();
+                        matchedToken = JjFillToken();
                         if (jjnewLexState[jjmatchedKind] != -1)
                             curLexState = jjnewLexState[jjmatchedKind];
                         return matchedToken;
@@ -956,7 +956,7 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
             }
         }
 
-        private void jjCheckNAdd(int state)
+        private void JjCheckNAdd(int state)
         {
             if (jjrounds[state] != jjround)
             {
@@ -964,24 +964,24 @@ namespace Lucene.Net.QueryParsers.Flexible.Standard.Parser
                 jjrounds[state] = jjround;
             }
         }
-        private void jjAddStates(int start, int end)
+        private void JjAddStates(int start, int end)
         {
             do
             {
                 jjstateSet[jjnewStateCnt++] = jjnextStates[start];
             } while (start++ != end);
         }
-        private void jjCheckNAddTwoStates(int state1, int state2)
+        private void JjCheckNAddTwoStates(int state1, int state2)
         {
-            jjCheckNAdd(state1);
-            jjCheckNAdd(state2);
+            JjCheckNAdd(state1);
+            JjCheckNAdd(state2);
         }
 
-        private void jjCheckNAddStates(int start, int end)
+        private void JjCheckNAddStates(int start, int end)
         {
             do
             {
-                jjCheckNAdd(jjnextStates[start]);
+                JjCheckNAdd(jjnextStates[start]);
             } while (start++ != end);
         }
     }