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 2017/02/04 20:32:40 UTC

[21/39] lucenenet git commit: Lucene.Net.Analysis.Common/Tartarus refactor: member accessibility and documentation comments

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4abfb341/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
index af66028..9d45b92 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
@@ -192,7 +192,7 @@
             I_p2 = other.I_p2;
             I_p1 = other.I_p1;
             I_pV = other.I_pV;
-            base.copy_from(other);
+            base.CopyFrom(other);
         }
 
         private bool r_prelude()
@@ -227,7 +227,7 @@
                                 do
                                 {
                                     // (, line 40
-                                    if (!(in_grouping(g_v, 97, 251)))
+                                    if (!(InGrouping(g_v, 97, 251)))
                                     {
                                         goto lab5;
                                     }
@@ -243,18 +243,18 @@
                                         {
                                             // (, line 40
                                             // literal, line 40
-                                            if (!(eq_s(1, "u")))
+                                            if (!(Eq_S(1, "u")))
                                             {
                                                 goto lab7;
                                             }
                                             // ], line 40
                                             m_ket = m_cursor;
-                                            if (!(in_grouping(g_v, 97, 251)))
+                                            if (!(InGrouping(g_v, 97, 251)))
                                             {
                                                 goto lab7;
                                             }
                                             // <-, line 40
-                                            slice_from("U");
+                                            SliceFrom("U");
                                             goto lab6;
                                         } while (false);
                                         lab7:
@@ -264,32 +264,32 @@
                                         {
                                             // (, line 41
                                             // literal, line 41
-                                            if (!(eq_s(1, "i")))
+                                            if (!(Eq_S(1, "i")))
                                             {
                                                 goto lab8;
                                             }
                                             // ], line 41
                                             m_ket = m_cursor;
-                                            if (!(in_grouping(g_v, 97, 251)))
+                                            if (!(InGrouping(g_v, 97, 251)))
                                             {
                                                 goto lab8;
                                             }
                                             // <-, line 41
-                                            slice_from("I");
+                                            SliceFrom("I");
                                             goto lab6;
                                         } while (false);
                                         lab8:
                                         m_cursor = v_4;
                                         // (, line 42
                                         // literal, line 42
-                                        if (!(eq_s(1, "y")))
+                                        if (!(Eq_S(1, "y")))
                                         {
                                             goto lab5;
                                         }
                                         // ], line 42
                                         m_ket = m_cursor;
                                         // <-, line 42
-                                        slice_from("Y");
+                                        SliceFrom("Y");
                                     } while (false);
                                     lab6:
                                     goto lab4;
@@ -303,39 +303,39 @@
                                     // [, line 45
                                     m_bra = m_cursor;
                                     // literal, line 45
-                                    if (!(eq_s(1, "y")))
+                                    if (!(Eq_S(1, "y")))
                                     {
                                         goto lab9;
                                     }
                                     // ], line 45
                                     m_ket = m_cursor;
-                                    if (!(in_grouping(g_v, 97, 251)))
+                                    if (!(InGrouping(g_v, 97, 251)))
                                     {
                                         goto lab9;
                                     }
                                     // <-, line 45
-                                    slice_from("Y");
+                                    SliceFrom("Y");
                                     goto lab4;
                                 } while (false);
                                 lab9:
                                 m_cursor = v_3;
                                 // (, line 47
                                 // literal, line 47
-                                if (!(eq_s(1, "q")))
+                                if (!(Eq_S(1, "q")))
                                 {
                                     goto lab3;
                                 }
                                 // [, line 47
                                 m_bra = m_cursor;
                                 // literal, line 47
-                                if (!(eq_s(1, "u")))
+                                if (!(Eq_S(1, "u")))
                                 {
                                     goto lab3;
                                 }
                                 // ], line 47
                                 m_ket = m_cursor;
                                 // <-, line 47
-                                slice_from("U");
+                                SliceFrom("U");
                             } while (false);
                             lab4:
                             m_cursor = v_2;
@@ -393,11 +393,11 @@
                     do
                     {
                         // (, line 57
-                        if (!(in_grouping(g_v, 97, 251)))
+                        if (!(InGrouping(g_v, 97, 251)))
                         {
                             goto lab2;
                         }
-                        if (!(in_grouping(g_v, 97, 251)))
+                        if (!(InGrouping(g_v, 97, 251)))
                         {
                             goto lab2;
                         }
@@ -415,7 +415,7 @@
                     do
                     {
                         // among, line 59
-                        if (find_among(a_0, 3) == 0)
+                        if (FindAmong(a_0, 3) == 0)
                         {
                             goto lab3;
                         }
@@ -437,7 +437,7 @@
 
                         do
                         {
-                            if (!(in_grouping(g_v, 97, 251)))
+                            if (!(InGrouping(g_v, 97, 251)))
                             {
                                 goto lab5;
                             }
@@ -471,7 +471,7 @@
 
                     do
                     {
-                        if (!(in_grouping(g_v, 97, 251)))
+                        if (!(InGrouping(g_v, 97, 251)))
                         {
                             goto lab8;
                         }
@@ -492,7 +492,7 @@
 
                     do
                     {
-                        if (!(out_grouping(g_v, 97, 251)))
+                        if (!(OutGrouping(g_v, 97, 251)))
                         {
                             goto lab10;
                         }
@@ -515,7 +515,7 @@
 
                     do
                     {
-                        if (!(in_grouping(g_v, 97, 251)))
+                        if (!(InGrouping(g_v, 97, 251)))
                         {
                             goto lab12;
                         }
@@ -536,7 +536,7 @@
 
                     do
                     {
-                        if (!(out_grouping(g_v, 97, 251)))
+                        if (!(OutGrouping(g_v, 97, 251)))
                         {
                             goto lab14;
                         }
@@ -574,7 +574,7 @@
                     // [, line 77
                     m_bra = m_cursor;
                     // substring, line 77
-                    among_var = find_among(a_1, 4);
+                    among_var = FindAmong(a_1, 4);
                     if (among_var == 0)
                     {
                         goto lab1;
@@ -588,17 +588,17 @@
                         case 1:
                             // (, line 78
                             // <-, line 78
-                            slice_from("i");
+                            SliceFrom("i");
                             break;
                         case 2:
                             // (, line 79
                             // <-, line 79
-                            slice_from("u");
+                            SliceFrom("u");
                             break;
                         case 3:
                             // (, line 80
                             // <-, line 80
-                            slice_from("y");
+                            SliceFrom("y");
                             break;
                         case 4:
                             // (, line 81
@@ -674,7 +674,7 @@
             // [, line 92
             m_ket = m_cursor;
             // substring, line 92
-            among_var = find_among_b(a_4, 43);
+            among_var = FindAmongB(a_4, 43);
             if (among_var == 0)
             {
                 return false;
@@ -693,7 +693,7 @@
                         return false;
                     }
                     // delete, line 96
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 99
@@ -703,7 +703,7 @@
                         return false;
                     }
                     // delete, line 99
-                    slice_del();
+                    SliceDel();
                     // try, line 100
                     v_1 = m_limit - m_cursor;
 
@@ -713,7 +713,7 @@
                         // [, line 100
                         m_ket = m_cursor;
                         // literal, line 100
-                        if (!(eq_s_b(2, "ic")))
+                        if (!(Eq_S_B(2, "ic")))
                         {
                             m_cursor = m_limit - v_1;
                             goto lab0;
@@ -735,13 +735,13 @@
                                     goto lab2;
                                 }
                                 // delete, line 100
-                                slice_del();
+                                SliceDel();
                                 goto lab1;
                             } while (false);
                             lab2:
                             m_cursor = m_limit - v_2;
                             // <-, line 100
-                            slice_from("iqU");
+                            SliceFrom("iqU");
                         } while (false);
                         lab1:;
                     } while (false);
@@ -755,7 +755,7 @@
                         return false;
                     }
                     // <-, line 104
-                    slice_from("log");
+                    SliceFrom("log");
                     break;
                 case 4:
                     // (, line 107
@@ -765,7 +765,7 @@
                         return false;
                     }
                     // <-, line 107
-                    slice_from("u");
+                    SliceFrom("u");
                     break;
                 case 5:
                     // (, line 110
@@ -775,7 +775,7 @@
                         return false;
                     }
                     // <-, line 110
-                    slice_from("ent");
+                    SliceFrom("ent");
                     break;
                 case 6:
                     // (, line 113
@@ -785,7 +785,7 @@
                         return false;
                     }
                     // delete, line 114
-                    slice_del();
+                    SliceDel();
                     // try, line 115
                     v_3 = m_limit - m_cursor;
 
@@ -795,7 +795,7 @@
                         // [, line 116
                         m_ket = m_cursor;
                         // substring, line 116
-                        among_var = find_among_b(a_2, 6);
+                        among_var = FindAmongB(a_2, 6);
                         if (among_var == 0)
                         {
                             m_cursor = m_limit - v_3;
@@ -817,11 +817,11 @@
                                     goto lab3;
                                 }
                                 // delete, line 117
-                                slice_del();
+                                SliceDel();
                                 // [, line 117
                                 m_ket = m_cursor;
                                 // literal, line 117
-                                if (!(eq_s_b(2, "at")))
+                                if (!(Eq_S_B(2, "at")))
                                 {
                                     m_cursor = m_limit - v_3;
                                     goto lab3;
@@ -835,7 +835,7 @@
                                     goto lab3;
                                 }
                                 // delete, line 117
-                                slice_del();
+                                SliceDel();
                                 break;
                             case 2:
                                 // (, line 118
@@ -854,7 +854,7 @@
                                             goto lab5;
                                         }
                                         // delete, line 118
-                                        slice_del();
+                                        SliceDel();
                                         goto lab4;
                                     } while (false);
                                     lab5:
@@ -867,7 +867,7 @@
                                         goto lab3;
                                     }
                                     // <-, line 118
-                                    slice_from("eux");
+                                    SliceFrom("eux");
                                 } while (false);
                                 lab4:
                                 break;
@@ -880,7 +880,7 @@
                                     goto lab3;
                                 }
                                 // delete, line 120
-                                slice_del();
+                                SliceDel();
                                 break;
                             case 4:
                                 // (, line 122
@@ -891,7 +891,7 @@
                                     goto lab3;
                                 }
                                 // <-, line 122
-                                slice_from("i");
+                                SliceFrom("i");
                                 break;
                         }
                     } while (false);
@@ -905,7 +905,7 @@
                         return false;
                     }
                     // delete, line 129
-                    slice_del();
+                    SliceDel();
                     // try, line 130
                     v_5 = m_limit - m_cursor;
 
@@ -915,7 +915,7 @@
                         // [, line 131
                         m_ket = m_cursor;
                         // substring, line 131
-                        among_var = find_among_b(a_3, 3);
+                        among_var = FindAmongB(a_3, 3);
                         if (among_var == 0)
                         {
                             m_cursor = m_limit - v_5;
@@ -945,13 +945,13 @@
                                             goto lab8;
                                         }
                                         // delete, line 132
-                                        slice_del();
+                                        SliceDel();
                                         goto lab7;
                                     } while (false);
                                     lab8:
                                     m_cursor = m_limit - v_6;
                                     // <-, line 132
-                                    slice_from("abl");
+                                    SliceFrom("abl");
                                 } while (false);
                                 lab7:
                                 break;
@@ -972,13 +972,13 @@
                                             goto lab10;
                                         }
                                         // delete, line 133
-                                        slice_del();
+                                        SliceDel();
                                         goto lab9;
                                     } while (false);
                                     lab10:
                                     m_cursor = m_limit - v_7;
                                     // <-, line 133
-                                    slice_from("iqU");
+                                    SliceFrom("iqU");
                                 } while (false);
                                 lab9:
                                 break;
@@ -991,7 +991,7 @@
                                     goto lab6;
                                 }
                                 // delete, line 134
-                                slice_del();
+                                SliceDel();
                                 break;
                         }
                     } while (false);
@@ -1005,7 +1005,7 @@
                         return false;
                     }
                     // delete, line 141
-                    slice_del();
+                    SliceDel();
                     // try, line 142
                     v_8 = m_limit - m_cursor;
 
@@ -1015,7 +1015,7 @@
                         // [, line 142
                         m_ket = m_cursor;
                         // literal, line 142
-                        if (!(eq_s_b(2, "at")))
+                        if (!(Eq_S_B(2, "at")))
                         {
                             m_cursor = m_limit - v_8;
                             goto lab11;
@@ -1029,11 +1029,11 @@
                             goto lab11;
                         }
                         // delete, line 142
-                        slice_del();
+                        SliceDel();
                         // [, line 142
                         m_ket = m_cursor;
                         // literal, line 142
-                        if (!(eq_s_b(2, "ic")))
+                        if (!(Eq_S_B(2, "ic")))
                         {
                             m_cursor = m_limit - v_8;
                             goto lab11;
@@ -1055,13 +1055,13 @@
                                     goto lab13;
                                 }
                                 // delete, line 142
-                                slice_del();
+                                SliceDel();
                                 goto lab12;
                             } while (false);
                             lab13:
                             m_cursor = m_limit - v_9;
                             // <-, line 142
-                            slice_from("iqU");
+                            SliceFrom("iqU");
                         } while (false);
                         lab12:;
                     } while (false);
@@ -1070,7 +1070,7 @@
                 case 9:
                     // (, line 144
                     // <-, line 144
-                    slice_from("eau");
+                    SliceFrom("eau");
                     break;
                 case 10:
                     // (, line 145
@@ -1080,7 +1080,7 @@
                         return false;
                     }
                     // <-, line 145
-                    slice_from("al");
+                    SliceFrom("al");
                     break;
                 case 11:
                     // (, line 147
@@ -1099,7 +1099,7 @@
                                 goto lab15;
                             }
                             // delete, line 147
-                            slice_del();
+                            SliceDel();
                             goto lab14;
                         } while (false);
                         lab15:
@@ -1111,7 +1111,7 @@
                             return false;
                         }
                         // <-, line 147
-                        slice_from("eux");
+                        SliceFrom("eux");
                     } while (false);
                     lab14:
                     break;
@@ -1122,12 +1122,12 @@
                     {
                         return false;
                     }
-                    if (!(out_grouping_b(g_v, 97, 251)))
+                    if (!(OutGroupingB(g_v, 97, 251)))
                     {
                         return false;
                     }
                     // delete, line 150
-                    slice_del();
+                    SliceDel();
                     break;
                 case 13:
                     // (, line 155
@@ -1139,7 +1139,7 @@
                     // fail, line 155
                     // (, line 155
                     // <-, line 155
-                    slice_from("ant");
+                    SliceFrom("ant");
                     return false;
                 case 14:
                     // (, line 156
@@ -1151,14 +1151,14 @@
                     // fail, line 156
                     // (, line 156
                     // <-, line 156
-                    slice_from("ent");
+                    SliceFrom("ent");
                     return false;
                 case 15:
                     // (, line 158
                     // test, line 158
                     v_11 = m_limit - m_cursor;
                     // (, line 158
-                    if (!(in_grouping_b(g_v, 97, 251)))
+                    if (!(InGroupingB(g_v, 97, 251)))
                     {
                         return false;
                     }
@@ -1171,7 +1171,7 @@
                     // fail, line 158
                     // (, line 158
                     // delete, line 158
-                    slice_del();
+                    SliceDel();
                     return false;
             }
             return true;
@@ -1197,7 +1197,7 @@
             // [, line 164
             m_ket = m_cursor;
             // substring, line 164
-            among_var = find_among_b(a_5, 35);
+            among_var = FindAmongB(a_5, 35);
             if (among_var == 0)
             {
                 m_limit_backward = v_2;
@@ -1212,13 +1212,13 @@
                     return false;
                 case 1:
                     // (, line 170
-                    if (!(out_grouping_b(g_v, 97, 251)))
+                    if (!(OutGroupingB(g_v, 97, 251)))
                     {
                         m_limit_backward = v_2;
                         return false;
                     }
                     // delete, line 170
-                    slice_del();
+                    SliceDel();
                     break;
             }
             m_limit_backward = v_2;
@@ -1246,7 +1246,7 @@
             // [, line 175
             m_ket = m_cursor;
             // substring, line 175
-            among_var = find_among_b(a_6, 38);
+            among_var = FindAmongB(a_6, 38);
             if (among_var == 0)
             {
                 m_limit_backward = v_2;
@@ -1268,17 +1268,17 @@
                         return false;
                     }
                     // delete, line 177
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 185
                     // delete, line 185
-                    slice_del();
+                    SliceDel();
                     break;
                 case 3:
                     // (, line 190
                     // delete, line 190
-                    slice_del();
+                    SliceDel();
                     // try, line 191
                     v_3 = m_limit - m_cursor;
 
@@ -1288,7 +1288,7 @@
                         // [, line 191
                         m_ket = m_cursor;
                         // literal, line 191
-                        if (!(eq_s_b(1, "e")))
+                        if (!(Eq_S_B(1, "e")))
                         {
                             m_cursor = m_limit - v_3;
                             goto lab0;
@@ -1296,7 +1296,7 @@
                         // ], line 191
                         m_bra = m_cursor;
                         // delete, line 191
-                        slice_del();
+                        SliceDel();
                     } while (false);
                     lab0:
                     break;
@@ -1323,7 +1323,7 @@
                 // [, line 199
                 m_ket = m_cursor;
                 // literal, line 199
-                if (!(eq_s_b(1, "s")))
+                if (!(Eq_S_B(1, "s")))
                 {
                     m_cursor = m_limit - v_1;
                     goto lab0;
@@ -1332,14 +1332,14 @@
                 m_bra = m_cursor;
                 // test, line 199
                 v_2 = m_limit - m_cursor;
-                if (!(out_grouping_b(g_keep_with_s, 97, 232)))
+                if (!(OutGroupingB(g_keep_with_s, 97, 232)))
                 {
                     m_cursor = m_limit - v_1;
                     goto lab0;
                 }
                 m_cursor = m_limit - v_2;
                 // delete, line 199
-                slice_del();
+                SliceDel();
             } while (false);
             lab0:
             // setlimit, line 200
@@ -1357,7 +1357,7 @@
             // [, line 201
             m_ket = m_cursor;
             // substring, line 201
-            among_var = find_among_b(a_7, 7);
+            among_var = FindAmongB(a_7, 7);
             if (among_var == 0)
             {
                 m_limit_backward = v_4;
@@ -1387,7 +1387,7 @@
                         do
                         {
                             // literal, line 202
-                            if (!(eq_s_b(1, "s")))
+                            if (!(Eq_S_B(1, "s")))
                             {
                                 goto lab2;
                             }
@@ -1396,7 +1396,7 @@
                         lab2:
                         m_cursor = m_limit - v_5;
                         // literal, line 202
-                        if (!(eq_s_b(1, "t")))
+                        if (!(Eq_S_B(1, "t")))
                         {
                             m_limit_backward = v_4;
                             return false;
@@ -1404,28 +1404,28 @@
                     } while (false);
                     lab1:
                     // delete, line 202
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 204
                     // <-, line 204
-                    slice_from("i");
+                    SliceFrom("i");
                     break;
                 case 3:
                     // (, line 205
                     // delete, line 205
-                    slice_del();
+                    SliceDel();
                     break;
                 case 4:
                     // (, line 206
                     // literal, line 206
-                    if (!(eq_s_b(2, "gu")))
+                    if (!(Eq_S_B(2, "gu")))
                     {
                         m_limit_backward = v_4;
                         return false;
                     }
                     // delete, line 206
-                    slice_del();
+                    SliceDel();
                     break;
             }
             m_limit_backward = v_4;
@@ -1439,7 +1439,7 @@
             // test, line 212
             v_1 = m_limit - m_cursor;
             // among, line 212
-            if (find_among_b(a_8, 5) == 0)
+            if (FindAmongB(a_8, 5) == 0)
             {
                 return false;
             }
@@ -1455,7 +1455,7 @@
             // ], line 212
             m_bra = m_cursor;
             // delete, line 212
-            slice_del();
+            SliceDel();
             return true;
         }
 
@@ -1473,7 +1473,7 @@
 
                     do
                     {
-                        if (!(out_grouping_b(g_v, 97, 251)))
+                        if (!(OutGroupingB(g_v, 97, 251)))
                         {
                             goto lab1;
                         }
@@ -1509,7 +1509,7 @@
                 do
                 {
                     // literal, line 217
-                    if (!(eq_s_b(1, "\u00E9")))
+                    if (!(Eq_S_B(1, "\u00E9")))
                     {
                         goto lab3;
                     }
@@ -1518,7 +1518,7 @@
                 lab3:
                 m_cursor = m_limit - v_3;
                 // literal, line 217
-                if (!(eq_s_b(1, "\u00E8")))
+                if (!(Eq_S_B(1, "\u00E8")))
                 {
                     return false;
                 }
@@ -1527,7 +1527,7 @@
             // ], line 217
             m_bra = m_cursor;
             // <-, line 217
-            slice_from("e");
+            SliceFrom("e");
             return true;
         }
 
@@ -1648,21 +1648,21 @@
                                 {
                                     // (, line 234
                                     // literal, line 234
-                                    if (!(eq_s_b(1, "Y")))
+                                    if (!(Eq_S_B(1, "Y")))
                                     {
                                         goto lab10;
                                     }
                                     // ], line 234
                                     m_bra = m_cursor;
                                     // <-, line 234
-                                    slice_from("i");
+                                    SliceFrom("i");
                                     goto lab9;
                                 } while (false);
                                 lab10:
                                 m_cursor = m_limit - v_8;
                                 // (, line 235
                                 // literal, line 235
-                                if (!(eq_s_b(1, "\u00E7")))
+                                if (!(Eq_S_B(1, "\u00E7")))
                                 {
                                     m_cursor = m_limit - v_7;
                                     goto lab8;
@@ -1670,7 +1670,7 @@
                                 // ], line 235
                                 m_bra = m_cursor;
                                 // <-, line 235
-                                slice_from("c");
+                                SliceFrom("c");
                             } while (false);
                             lab9:;
                         } while (false);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4abfb341/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
index 31fc7aa..deef2dc 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
@@ -74,7 +74,7 @@
             I_x = other.I_x;
             I_p2 = other.I_p2;
             I_p1 = other.I_p1;
-            base.copy_from(other);
+            base.CopyFrom(other);
         }
 
         private bool r_prelude()
@@ -105,7 +105,7 @@
                         do
                         {
                             // (, line 30
-                            if (!(in_grouping(g_v, 97, 252)))
+                            if (!(InGrouping(g_v, 97, 252)))
                             {
                                 goto lab3;
                             }
@@ -121,36 +121,36 @@
                                 {
                                     // (, line 31
                                     // literal, line 31
-                                    if (!(eq_s(1, "u")))
+                                    if (!(Eq_S(1, "u")))
                                     {
                                         goto lab5;
                                     }
                                     // ], line 31
                                     m_ket = m_cursor;
-                                    if (!(in_grouping(g_v, 97, 252)))
+                                    if (!(InGrouping(g_v, 97, 252)))
                                     {
                                         goto lab5;
                                     }
                                     // <-, line 31
-                                    slice_from("U");
+                                    SliceFrom("U");
                                     goto lab4;
                                 } while (false);
                                 lab5:
                                 m_cursor = v_4;
                                 // (, line 32
                                 // literal, line 32
-                                if (!(eq_s(1, "y")))
+                                if (!(Eq_S(1, "y")))
                                 {
                                     goto lab3;
                                 }
                                 // ], line 32
                                 m_ket = m_cursor;
-                                if (!(in_grouping(g_v, 97, 252)))
+                                if (!(InGrouping(g_v, 97, 252)))
                                 {
                                     goto lab3;
                                 }
                                 // <-, line 32
-                                slice_from("Y");
+                                SliceFrom("Y");
                             } while (false);
                             lab4:
                             m_cursor = v_3;
@@ -194,7 +194,7 @@
                     // [, line 36
                     m_bra = m_cursor;
                     // substring, line 36
-                    among_var = find_among(a_0, 6);
+                    among_var = FindAmong(a_0, 6);
                     if (among_var == 0)
                     {
                         goto lab7;
@@ -208,22 +208,22 @@
                         case 1:
                             // (, line 37
                             // <-, line 37
-                            slice_from("ss");
+                            SliceFrom("ss");
                             break;
                         case 2:
                             // (, line 38
                             // <-, line 38
-                            slice_from("\u00E4");
+                            SliceFrom("\u00E4");
                             break;
                         case 3:
                             // (, line 39
                             // <-, line 39
-                            slice_from("\u00F6");
+                            SliceFrom("\u00F6");
                             break;
                         case 4:
                             // (, line 40
                             // <-, line 40
-                            slice_from("\u00FC");
+                            SliceFrom("\u00FC");
                             break;
                         case 5:
                             // (, line 41
@@ -294,7 +294,7 @@
 
                 do
                 {
-                    if (!(in_grouping(g_v, 97, 252)))
+                    if (!(InGrouping(g_v, 97, 252)))
                     {
                         goto lab1;
                     }
@@ -315,7 +315,7 @@
 
                 do
                 {
-                    if (!(out_grouping(g_v, 97, 252)))
+                    if (!(OutGrouping(g_v, 97, 252)))
                     {
                         goto lab3;
                     }
@@ -350,7 +350,7 @@
 
                 do
                 {
-                    if (!(in_grouping(g_v, 97, 252)))
+                    if (!(InGrouping(g_v, 97, 252)))
                     {
                         goto lab6;
                     }
@@ -371,7 +371,7 @@
 
                 do
                 {
-                    if (!(out_grouping(g_v, 97, 252)))
+                    if (!(OutGrouping(g_v, 97, 252)))
                     {
                         goto lab8;
                     }
@@ -406,7 +406,7 @@
                     // [, line 63
                     m_bra = m_cursor;
                     // substring, line 63
-                    among_var = find_among(a_1, 6);
+                    among_var = FindAmong(a_1, 6);
                     if (among_var == 0)
                     {
                         goto lab1;
@@ -420,27 +420,27 @@
                         case 1:
                             // (, line 64
                             // <-, line 64
-                            slice_from("y");
+                            SliceFrom("y");
                             break;
                         case 2:
                             // (, line 65
                             // <-, line 65
-                            slice_from("u");
+                            SliceFrom("u");
                             break;
                         case 3:
                             // (, line 66
                             // <-, line 66
-                            slice_from("a");
+                            SliceFrom("a");
                             break;
                         case 4:
                             // (, line 67
                             // <-, line 67
-                            slice_from("o");
+                            SliceFrom("o");
                             break;
                         case 5:
                             // (, line 68
                             // <-, line 68
-                            slice_from("u");
+                            SliceFrom("u");
                             break;
                         case 6:
                             // (, line 69
@@ -511,7 +511,7 @@
                 // [, line 81
                 m_ket = m_cursor;
                 // substring, line 81
-                among_var = find_among_b(a_2, 7);
+                among_var = FindAmongB(a_2, 7);
                 if (among_var == 0)
                 {
                     goto lab0;
@@ -530,16 +530,16 @@
                     case 1:
                         // (, line 83
                         // delete, line 83
-                        slice_del();
+                        SliceDel();
                         break;
                     case 2:
                         // (, line 86
-                        if (!(in_grouping_b(g_s_ending, 98, 116)))
+                        if (!(InGroupingB(g_s_ending, 98, 116)))
                         {
                             goto lab0;
                         }
                         // delete, line 86
-                        slice_del();
+                        SliceDel();
                         break;
                 }
             } while (false);
@@ -554,7 +554,7 @@
                 // [, line 91
                 m_ket = m_cursor;
                 // substring, line 91
-                among_var = find_among_b(a_3, 4);
+                among_var = FindAmongB(a_3, 4);
                 if (among_var == 0)
                 {
                     goto lab1;
@@ -573,11 +573,11 @@
                     case 1:
                         // (, line 93
                         // delete, line 93
-                        slice_del();
+                        SliceDel();
                         break;
                     case 2:
                         // (, line 96
-                        if (!(in_grouping_b(g_st_ending, 98, 116)))
+                        if (!(InGroupingB(g_st_ending, 98, 116)))
                         {
                             goto lab1;
                         }
@@ -591,7 +591,7 @@
                             m_cursor = c;
                         }
                         // delete, line 96
-                        slice_del();
+                        SliceDel();
                         break;
                 }
             } while (false);
@@ -606,7 +606,7 @@
                 // [, line 101
                 m_ket = m_cursor;
                 // substring, line 101
-                among_var = find_among_b(a_5, 8);
+                among_var = FindAmongB(a_5, 8);
                 if (among_var == 0)
                 {
                     goto lab2;
@@ -625,7 +625,7 @@
                     case 1:
                         // (, line 103
                         // delete, line 103
-                        slice_del();
+                        SliceDel();
                         // try, line 104
                         v_4 = m_limit - m_cursor;
 
@@ -635,7 +635,7 @@
                             // [, line 104
                             m_ket = m_cursor;
                             // literal, line 104
-                            if (!(eq_s_b(2, "ig")))
+                            if (!(Eq_S_B(2, "ig")))
                             {
                                 m_cursor = m_limit - v_4;
                                 goto lab3;
@@ -649,7 +649,7 @@
                                 do
                                 {
                                     // literal, line 104
-                                    if (!(eq_s_b(1, "e")))
+                                    if (!(Eq_S_B(1, "e")))
                                     {
                                         goto lab4;
                                     }
@@ -666,7 +666,7 @@
                                 goto lab3;
                             }
                             // delete, line 104
-                            slice_del();
+                            SliceDel();
                         } while (false);
                         lab3:
                         break;
@@ -679,7 +679,7 @@
                             do
                             {
                                 // literal, line 107
-                                if (!(eq_s_b(1, "e")))
+                                if (!(Eq_S_B(1, "e")))
                                 {
                                     goto lab5;
                                 }
@@ -689,12 +689,12 @@
                             m_cursor = m_limit - v_6;
                         }
                         // delete, line 107
-                        slice_del();
+                        SliceDel();
                         break;
                     case 3:
                         // (, line 110
                         // delete, line 110
-                        slice_del();
+                        SliceDel();
                         // try, line 111
                         v_7 = m_limit - m_cursor;
 
@@ -712,7 +712,7 @@
                                 do
                                 {
                                     // literal, line 112
-                                    if (!(eq_s_b(2, "er")))
+                                    if (!(Eq_S_B(2, "er")))
                                     {
                                         goto lab8;
                                     }
@@ -721,7 +721,7 @@
                                 lab8:
                                 m_cursor = m_limit - v_8;
                                 // literal, line 112
-                                if (!(eq_s_b(2, "en")))
+                                if (!(Eq_S_B(2, "en")))
                                 {
                                     m_cursor = m_limit - v_7;
                                     goto lab6;
@@ -737,14 +737,14 @@
                                 goto lab6;
                             }
                             // delete, line 112
-                            slice_del();
+                            SliceDel();
                         } while (false);
                         lab6:
                         break;
                     case 4:
                         // (, line 116
                         // delete, line 116
-                        slice_del();
+                        SliceDel();
                         // try, line 117
                         v_9 = m_limit - m_cursor;
 
@@ -754,7 +754,7 @@
                             // [, line 118
                             m_ket = m_cursor;
                             // substring, line 118
-                            among_var = find_among_b(a_4, 2);
+                            among_var = FindAmongB(a_4, 2);
                             if (among_var == 0)
                             {
                                 m_cursor = m_limit - v_9;
@@ -776,7 +776,7 @@
                                 case 1:
                                     // (, line 120
                                     // delete, line 120
-                                    slice_del();
+                                    SliceDel();
                                     break;
                             }
                         } while (false);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4abfb341/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
index 24d650b..37ff2e7 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
@@ -65,7 +65,7 @@
             I_x = other.I_x;
             I_p2 = other.I_p2;
             I_p1 = other.I_p1;
-            base.copy_from(other);
+            base.CopyFrom(other);
         }
 
         private bool r_prelude()
@@ -100,14 +100,14 @@
                             // [, line 32
                             m_bra = m_cursor;
                             // literal, line 32
-                            if (!(eq_s(1, "\u00DF")))
+                            if (!(Eq_S(1, "\u00DF")))
                             {
                                 goto lab3;
                             }
                             // ], line 32
                             m_ket = m_cursor;
                             // <-, line 32
-                            slice_from("ss");
+                            SliceFrom("ss");
                             goto lab2;
                         } while (false);
                         lab3:
@@ -154,7 +154,7 @@
                         do
                         {
                             // (, line 36
-                            if (!(in_grouping(g_v, 97, 252)))
+                            if (!(InGrouping(g_v, 97, 252)))
                             {
                                 goto lab7;
                             }
@@ -170,36 +170,36 @@
                                 {
                                     // (, line 37
                                     // literal, line 37
-                                    if (!(eq_s(1, "u")))
+                                    if (!(Eq_S(1, "u")))
                                     {
                                         goto lab9;
                                     }
                                     // ], line 37
                                     m_ket = m_cursor;
-                                    if (!(in_grouping(g_v, 97, 252)))
+                                    if (!(InGrouping(g_v, 97, 252)))
                                     {
                                         goto lab9;
                                     }
                                     // <-, line 37
-                                    slice_from("U");
+                                    SliceFrom("U");
                                     goto lab8;
                                 } while (false);
                                 lab9:
                                 m_cursor = v_6;
                                 // (, line 38
                                 // literal, line 38
-                                if (!(eq_s(1, "y")))
+                                if (!(Eq_S(1, "y")))
                                 {
                                     goto lab7;
                                 }
                                 // ], line 38
                                 m_ket = m_cursor;
-                                if (!(in_grouping(g_v, 97, 252)))
+                                if (!(InGrouping(g_v, 97, 252)))
                                 {
                                     goto lab7;
                                 }
                                 // <-, line 38
-                                slice_from("Y");
+                                SliceFrom("Y");
                             } while (false);
                             lab8:
                             m_cursor = v_5;
@@ -261,7 +261,7 @@
                 
                 do
                 {
-                    if (!(in_grouping(g_v, 97, 252)))
+                    if (!(InGrouping(g_v, 97, 252)))
                     {
                         goto lab1;
                     }
@@ -282,7 +282,7 @@
                 
                 do
                 {
-                    if (!(out_grouping(g_v, 97, 252)))
+                    if (!(OutGrouping(g_v, 97, 252)))
                     {
                         goto lab3;
                     }
@@ -316,7 +316,7 @@
             {
                 do
                 {
-                    if (!(in_grouping(g_v, 97, 252)))
+                    if (!(InGrouping(g_v, 97, 252)))
                     {
                         goto lab6;
                     }
@@ -337,7 +337,7 @@
                 
                 do
                 {
-                    if (!(out_grouping(g_v, 97, 252)))
+                    if (!(OutGrouping(g_v, 97, 252)))
                     {
                         goto lab8;
                     }
@@ -372,7 +372,7 @@
                     // [, line 57
                     m_bra = m_cursor;
                     // substring, line 57
-                    among_var = find_among(a_0, 6);
+                    among_var = FindAmong(a_0, 6);
                     if (among_var == 0)
                     {
                         goto lab1;
@@ -386,27 +386,27 @@
                         case 1:
                             // (, line 58
                             // <-, line 58
-                            slice_from("y");
+                            SliceFrom("y");
                             break;
                         case 2:
                             // (, line 59
                             // <-, line 59
-                            slice_from("u");
+                            SliceFrom("u");
                             break;
                         case 3:
                             // (, line 60
                             // <-, line 60
-                            slice_from("a");
+                            SliceFrom("a");
                             break;
                         case 4:
                             // (, line 61
                             // <-, line 61
-                            slice_from("o");
+                            SliceFrom("o");
                             break;
                         case 5:
                             // (, line 62
                             // <-, line 62
-                            slice_from("u");
+                            SliceFrom("u");
                             break;
                         case 6:
                             // (, line 63
@@ -476,7 +476,7 @@
                 // [, line 75
                 m_ket = m_cursor;
                 // substring, line 75
-                among_var = find_among_b(a_1, 7);
+                among_var = FindAmongB(a_1, 7);
                 if (among_var == 0)
                 {
                     goto lab0;
@@ -495,16 +495,16 @@
                     case 1:
                         // (, line 77
                         // delete, line 77
-                        slice_del();
+                        SliceDel();
                         break;
                     case 2:
                         // (, line 80
-                        if (!(in_grouping_b(g_s_ending, 98, 116)))
+                        if (!(InGroupingB(g_s_ending, 98, 116)))
                         {
                             goto lab0;
                         }
                         // delete, line 80
-                        slice_del();
+                        SliceDel();
                         break;
                 }
             } while (false);
@@ -518,7 +518,7 @@
                 // [, line 85
                 m_ket = m_cursor;
                 // substring, line 85
-                among_var = find_among_b(a_2, 4);
+                among_var = FindAmongB(a_2, 4);
                 if (among_var == 0)
                 {
                     goto lab1;
@@ -537,11 +537,11 @@
                     case 1:
                         // (, line 87
                         // delete, line 87
-                        slice_del();
+                        SliceDel();
                         break;
                     case 2:
                         // (, line 90
-                        if (!(in_grouping_b(g_st_ending, 98, 116)))
+                        if (!(InGroupingB(g_st_ending, 98, 116)))
                         {
                             goto lab1;
                         }
@@ -555,7 +555,7 @@
                             m_cursor = c;
                         }
                         // delete, line 90
-                        slice_del();
+                        SliceDel();
                         break;
                 }
             } while (false);
@@ -569,7 +569,7 @@
                 // [, line 95
                 m_ket = m_cursor;
                 // substring, line 95
-                among_var = find_among_b(a_4, 8);
+                among_var = FindAmongB(a_4, 8);
                 if (among_var == 0)
                 {
                     goto lab2;
@@ -588,7 +588,7 @@
                     case 1:
                         // (, line 97
                         // delete, line 97
-                        slice_del();
+                        SliceDel();
                         // try, line 98
                         v_4 = m_limit - m_cursor;
                         do
@@ -597,7 +597,7 @@
                             // [, line 98
                             m_ket = m_cursor;
                             // literal, line 98
-                            if (!(eq_s_b(2, "ig")))
+                            if (!(Eq_S_B(2, "ig")))
                             {
                                 m_cursor = m_limit - v_4;
                                 goto lab3;
@@ -610,7 +610,7 @@
                                 do
                                 {
                                     // literal, line 98
-                                    if (!(eq_s_b(1, "e")))
+                                    if (!(Eq_S_B(1, "e")))
                                     {
                                         goto lab4;
                                     }
@@ -627,7 +627,7 @@
                                 goto lab3;
                             }
                             // delete, line 98
-                            slice_del();
+                            SliceDel();
                         } while (false);
                         lab3:
                         break;
@@ -639,7 +639,7 @@
                             do
                             {
                                 // literal, line 101
-                                if (!(eq_s_b(1, "e")))
+                                if (!(Eq_S_B(1, "e")))
                                 {
                                     goto lab5;
                                 }
@@ -649,12 +649,12 @@
                             m_cursor = m_limit - v_6;
                         }
                         // delete, line 101
-                        slice_del();
+                        SliceDel();
                         break;
                     case 3:
                         // (, line 104
                         // delete, line 104
-                        slice_del();
+                        SliceDel();
                         // try, line 105
                         v_7 = m_limit - m_cursor;
                         do
@@ -669,7 +669,7 @@
                                 do
                                 {
                                     // literal, line 106
-                                    if (!(eq_s_b(2, "er")))
+                                    if (!(Eq_S_B(2, "er")))
                                     {
                                         goto lab8;
                                     }
@@ -678,7 +678,7 @@
                                 lab8:
                                 m_cursor = m_limit - v_8;
                                 // literal, line 106
-                                if (!(eq_s_b(2, "en")))
+                                if (!(Eq_S_B(2, "en")))
                                 {
                                     m_cursor = m_limit - v_7;
                                     goto lab6;
@@ -694,14 +694,14 @@
                                 goto lab6;
                             }
                             // delete, line 106
-                            slice_del();
+                            SliceDel();
                         } while (false);
                         lab6:
                         break;
                     case 4:
                         // (, line 110
                         // delete, line 110
-                        slice_del();
+                        SliceDel();
                         // try, line 111
                         v_9 = m_limit - m_cursor;
                         do
@@ -710,7 +710,7 @@
                             // [, line 112
                             m_ket = m_cursor;
                             // substring, line 112
-                            among_var = find_among_b(a_3, 2);
+                            among_var = FindAmongB(a_3, 2);
                             if (among_var == 0)
                             {
                                 m_cursor = m_limit - v_9;
@@ -732,7 +732,7 @@
                                 case 1:
                                     // (, line 114
                                     // delete, line 114
-                                    slice_del();
+                                    SliceDel();
                                     break;
                             }
                         } while (false);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/4abfb341/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
index 10b5f76..8a029cf 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
@@ -233,7 +233,7 @@
         private void copy_from(HungarianStemmer other)
         {
             I_p1 = other.I_p1;
-            base.copy_from(other);
+            base.CopyFrom(other);
         }
 
         private bool r_mark_regions()
@@ -250,7 +250,7 @@
                 do
                 {
                     // (, line 48
-                    if (!(in_grouping(g_v, 97, 252)))
+                    if (!(InGrouping(g_v, 97, 252)))
                     {
                         goto lab1;
                     }
@@ -260,7 +260,7 @@
                         v_2 = m_cursor;
                         do
                         {
-                            if (!(out_grouping(g_v, 97, 252)))
+                            if (!(OutGrouping(g_v, 97, 252)))
                             {
                                 goto lab3;
                             }
@@ -283,7 +283,7 @@
                         do
                         {
                             // among, line 49
-                            if (find_among(a_0, 8) == 0)
+                            if (FindAmong(a_0, 8) == 0)
                             {
                                 goto lab5;
                             }
@@ -306,7 +306,7 @@
                 lab1:
                 m_cursor = v_1;
                 // (, line 53
-                if (!(out_grouping(g_v, 97, 252)))
+                if (!(OutGrouping(g_v, 97, 252)))
                 {
                     return false;
                 }
@@ -315,7 +315,7 @@
                 {
                     do
                     {
-                        if (!(in_grouping(g_v, 97, 252)))
+                        if (!(InGrouping(g_v, 97, 252)))
                         {
                             goto lab7;
                         }
@@ -352,7 +352,7 @@
             // [, line 61
             m_ket = m_cursor;
             // substring, line 61
-            among_var = find_among_b(a_1, 2);
+            among_var = FindAmongB(a_1, 2);
             if (among_var == 0)
             {
                 return false;
@@ -371,12 +371,12 @@
                 case 1:
                     // (, line 62
                     // <-, line 62
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 2:
                     // (, line 63
                     // <-, line 63
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
             }
             return true;
@@ -389,7 +389,7 @@
             // test, line 68
             v_1 = m_limit - m_cursor;
             // among, line 68
-            if (find_among_b(a_2, 23) == 0)
+            if (FindAmongB(a_2, 23) == 0)
             {
                 return false;
             }
@@ -420,7 +420,7 @@
             // ], line 73
             m_bra = m_cursor;
             // delete, line 73
-            slice_del();
+            SliceDel();
             return true;
         }
 
@@ -431,7 +431,7 @@
             // [, line 77
             m_ket = m_cursor;
             // substring, line 77
-            among_var = find_among_b(a_3, 2);
+            among_var = FindAmongB(a_3, 2);
             if (among_var == 0)
             {
                 return false;
@@ -465,7 +465,7 @@
                     break;
             }
             // delete, line 81
-            slice_del();
+            SliceDel();
             // call undouble, line 82
             if (!r_undouble())
             {
@@ -480,7 +480,7 @@
             // [, line 87
             m_ket = m_cursor;
             // substring, line 87
-            if (find_among_b(a_4, 44) == 0)
+            if (FindAmongB(a_4, 44) == 0)
             {
                 return false;
             }
@@ -492,7 +492,7 @@
                 return false;
             }
             // delete, line 111
-            slice_del();
+            SliceDel();
             // call v_ending, line 112
             if (!r_v_ending())
             {
@@ -508,7 +508,7 @@
             // [, line 116
             m_ket = m_cursor;
             // substring, line 116
-            among_var = find_among_b(a_5, 3);
+            among_var = FindAmongB(a_5, 3);
             if (among_var == 0)
             {
                 return false;
@@ -527,17 +527,17 @@
                 case 1:
                     // (, line 117
                     // <-, line 117
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 2:
                     // (, line 118
                     // <-, line 118
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 3:
                     // (, line 119
                     // <-, line 119
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
             }
             return true;
@@ -550,7 +550,7 @@
             // [, line 124
             m_ket = m_cursor;
             // substring, line 124
-            among_var = find_among_b(a_6, 6);
+            among_var = FindAmongB(a_6, 6);
             if (among_var == 0)
             {
                 return false;
@@ -569,22 +569,22 @@
                 case 1:
                     // (, line 125
                     // delete, line 125
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 126
                     // delete, line 126
-                    slice_del();
+                    SliceDel();
                     break;
                 case 3:
                     // (, line 127
                     // <-, line 127
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 4:
                     // (, line 128
                     // <-, line 128
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
             }
             return true;
@@ -597,7 +597,7 @@
             // [, line 133
             m_ket = m_cursor;
             // substring, line 133
-            among_var = find_among_b(a_7, 2);
+            among_var = FindAmongB(a_7, 2);
             if (among_var == 0)
             {
                 return false;
@@ -631,7 +631,7 @@
                     break;
             }
             // delete, line 137
-            slice_del();
+            SliceDel();
             // call undouble, line 138
             if (!r_undouble())
             {
@@ -647,7 +647,7 @@
             // [, line 142
             m_ket = m_cursor;
             // substring, line 142
-            among_var = find_among_b(a_8, 7);
+            among_var = FindAmongB(a_8, 7);
             if (among_var == 0)
             {
                 return false;
@@ -666,37 +666,37 @@
                 case 1:
                     // (, line 143
                     // <-, line 143
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 2:
                     // (, line 144
                     // <-, line 144
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 3:
                     // (, line 145
                     // delete, line 145
-                    slice_del();
+                    SliceDel();
                     break;
                 case 4:
                     // (, line 146
                     // delete, line 146
-                    slice_del();
+                    SliceDel();
                     break;
                 case 5:
                     // (, line 147
                     // delete, line 147
-                    slice_del();
+                    SliceDel();
                     break;
                 case 6:
                     // (, line 148
                     // delete, line 148
-                    slice_del();
+                    SliceDel();
                     break;
                 case 7:
                     // (, line 149
                     // delete, line 149
-                    slice_del();
+                    SliceDel();
                     break;
             }
             return true;
@@ -709,7 +709,7 @@
             // [, line 154
             m_ket = m_cursor;
             // substring, line 154
-            among_var = find_among_b(a_9, 12);
+            among_var = FindAmongB(a_9, 12);
             if (among_var == 0)
             {
                 return false;
@@ -728,47 +728,47 @@
                 case 1:
                     // (, line 155
                     // delete, line 155
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 156
                     // <-, line 156
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 3:
                     // (, line 157
                     // <-, line 157
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 4:
                     // (, line 158
                     // delete, line 158
-                    slice_del();
+                    SliceDel();
                     break;
                 case 5:
                     // (, line 159
                     // <-, line 159
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 6:
                     // (, line 160
                     // <-, line 160
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 7:
                     // (, line 161
                     // delete, line 161
-                    slice_del();
+                    SliceDel();
                     break;
                 case 8:
                     // (, line 162
                     // <-, line 162
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 9:
                     // (, line 163
                     // delete, line 163
-                    slice_del();
+                    SliceDel();
                     break;
             }
             return true;
@@ -781,7 +781,7 @@
             // [, line 168
             m_ket = m_cursor;
             // substring, line 168
-            among_var = find_among_b(a_10, 31);
+            among_var = FindAmongB(a_10, 31);
             if (among_var == 0)
             {
                 return false;
@@ -800,102 +800,102 @@
                 case 1:
                     // (, line 169
                     // delete, line 169
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 170
                     // <-, line 170
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 3:
                     // (, line 171
                     // <-, line 171
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 4:
                     // (, line 172
                     // delete, line 172
-                    slice_del();
+                    SliceDel();
                     break;
                 case 5:
                     // (, line 173
                     // <-, line 173
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 6:
                     // (, line 174
                     // <-, line 174
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 7:
                     // (, line 175
                     // delete, line 175
-                    slice_del();
+                    SliceDel();
                     break;
                 case 8:
                     // (, line 176
                     // delete, line 176
-                    slice_del();
+                    SliceDel();
                     break;
                 case 9:
                     // (, line 177
                     // delete, line 177
-                    slice_del();
+                    SliceDel();
                     break;
                 case 10:
                     // (, line 178
                     // <-, line 178
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 11:
                     // (, line 179
                     // <-, line 179
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 12:
                     // (, line 180
                     // delete, line 180
-                    slice_del();
+                    SliceDel();
                     break;
                 case 13:
                     // (, line 181
                     // delete, line 181
-                    slice_del();
+                    SliceDel();
                     break;
                 case 14:
                     // (, line 182
                     // <-, line 182
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 15:
                     // (, line 183
                     // <-, line 183
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 16:
                     // (, line 184
                     // delete, line 184
-                    slice_del();
+                    SliceDel();
                     break;
                 case 17:
                     // (, line 185
                     // delete, line 185
-                    slice_del();
+                    SliceDel();
                     break;
                 case 18:
                     // (, line 186
                     // delete, line 186
-                    slice_del();
+                    SliceDel();
                     break;
                 case 19:
                     // (, line 187
                     // <-, line 187
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 20:
                     // (, line 188
                     // <-, line 188
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
             }
             return true;
@@ -908,7 +908,7 @@
             // [, line 193
             m_ket = m_cursor;
             // substring, line 193
-            among_var = find_among_b(a_11, 42);
+            among_var = FindAmongB(a_11, 42);
             if (among_var == 0)
             {
                 return false;
@@ -927,147 +927,147 @@
                 case 1:
                     // (, line 194
                     // delete, line 194
-                    slice_del();
+                    SliceDel();
                     break;
                 case 2:
                     // (, line 195
                     // <-, line 195
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 3:
                     // (, line 196
                     // <-, line 196
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 4:
                     // (, line 197
                     // delete, line 197
-                    slice_del();
+                    SliceDel();
                     break;
                 case 5:
                     // (, line 198
                     // delete, line 198
-                    slice_del();
+                    SliceDel();
                     break;
                 case 6:
                     // (, line 199
                     // delete, line 199
-                    slice_del();
+                    SliceDel();
                     break;
                 case 7:
                     // (, line 200
                     // <-, line 200
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 8:
                     // (, line 201
                     // <-, line 201
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 9:
                     // (, line 202
                     // delete, line 202
-                    slice_del();
+                    SliceDel();
                     break;
                 case 10:
                     // (, line 203
                     // delete, line 203
-                    slice_del();
+                    SliceDel();
                     break;
                 case 11:
                     // (, line 204
                     // delete, line 204
-                    slice_del();
+                    SliceDel();
                     break;
                 case 12:
                     // (, line 205
                     // <-, line 205
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 13:
                     // (, line 206
                     // <-, line 206
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 14:
                     // (, line 207
                     // delete, line 207
-                    slice_del();
+                    SliceDel();
                     break;
                 case 15:
                     // (, line 208
                     // delete, line 208
-                    slice_del();
+                    SliceDel();
                     break;
                 case 16:
                     // (, line 209
                     // delete, line 209
-                    slice_del();
+                    SliceDel();
                     break;
                 case 17:
                     // (, line 210
                     // delete, line 210
-                    slice_del();
+                    SliceDel();
                     break;
                 case 18:
                     // (, line 211
                     // <-, line 211
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 19:
                     // (, line 212
                     // <-, line 212
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 20:
                     // (, line 214
                     // delete, line 214
-                    slice_del();
+                    SliceDel();
                     break;
                 case 21:
                     // (, line 215
                     // delete, line 215
-                    slice_del();
+                    SliceDel();
                     break;
                 case 22:
                     // (, line 216
                     // <-, line 216
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 23:
                     // (, line 217
                     // <-, line 217
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 24:
                     // (, line 218
                     // delete, line 218
-                    slice_del();
+                    SliceDel();
                     break;
                 case 25:
                     // (, line 219
                     // delete, line 219
-                    slice_del();
+                    SliceDel();
                     break;
                 case 26:
                     // (, line 220
                     // delete, line 220
-                    slice_del();
+                    SliceDel();
                     break;
                 case 27:
                     // (, line 221
                     // <-, line 221
-                    slice_from("a");
+                    SliceFrom("a");
                     break;
                 case 28:
                     // (, line 222
                     // <-, line 222
-                    slice_from("e");
+                    SliceFrom("e");
                     break;
                 case 29:
                     // (, line 223
                     // delete, line 223
-                    slice_del();
+                    SliceDel();
                     break;
             }
             return true;