2005-01-31 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mcs / class / System / System.Text.RegularExpressions / syntax.cs

diff --git a/mcs/class/System/System.Text.RegularExpressions/syntax.cs b/mcs/class/System/System.Text.RegularExpressions/syntax.cs
index 6f9984978cd816e521476d4e2fadbf8a5c968a36..46a24cb8a04750e873c9fdca75d1ad1ddf8f7709 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/syntax.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/syntax.cs
@@ -6,6 +6,27 @@
 // author:     Dan Lewis (dlewis@gmx.co.uk)
 //             (c) 2002
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
 
@@ -319,7 +340,11 @@ namespace System.Text.RegularExpressions.Syntax {
                public override void Compile (ICompiler cmp, bool reverse) {
                        // can't invoke Group.Compile from here :(
                        // so I'll just repeat the code
-               
+                       
+                       LinkRef tail = cmp.NewLink ();
+
+                       cmp.EmitBalanceStart (this.Number, balance.Number, this.IsNamed,  tail);
+
                        int count = Expressions.Count;
                        for (int i = 0; i < count; ++ i) {
                                Expression e;
@@ -331,7 +356,8 @@ namespace System.Text.RegularExpressions.Syntax {
                                e.Compile (cmp, reverse);
                        }
 
-                       cmp.EmitBalance (this.Number, balance.Number);
+                       cmp.EmitBalance ();
+                       cmp.ResolveLink(tail);
                }
 
                private CapturingGroup balance;
@@ -768,14 +794,9 @@ namespace System.Text.RegularExpressions.Syntax {
 
                        // initialize pos/neg category arrays
 
-                       Array cat_values = Enum.GetValues (typeof (Category));
-                       int cat_size = (int)(Category)cat_values.GetValue (cat_values.Length - 1) + 1;
-                       pos_cats = new bool[cat_size];
-                       neg_cats = new bool[cat_size];
-                       for (int i = 0; i < cat_size; ++ i) {
-                               pos_cats[i] = false;
-                               neg_cats[i] = false;
-                       }
+                       int cat_size = (int) Category.LastValue;
+                       pos_cats = new BitArray (cat_size);
+                       neg_cats = new BitArray (cat_size);
                }
 
                public CharacterClass (Category cat, bool negate) : this (false, false) {
@@ -796,15 +817,8 @@ namespace System.Text.RegularExpressions.Syntax {
                        int n = (int)cat;
                        
                        if (negate) {
-                               if (pos_cats[n])
-                                       pos_cats[n] = false;
-
                                neg_cats[n] = true;
-                       }
-                       else {
-                               if (neg_cats[n])
-                                       neg_cats[n] = false;
-
+                       } else {
                                pos_cats[n] = true;
                        }
                }
@@ -871,10 +885,14 @@ namespace System.Text.RegularExpressions.Syntax {
                        // emit categories
 
                        for (int i = 0; i < pos_cats.Length; ++ i) {
-                               if (pos_cats[i])
-                                       cmp.EmitCategory ((Category)i, negate, reverse);
-                               else if (neg_cats[i])
+                               if (pos_cats[i]) {
+                                       if (neg_cats [i])
+                                               cmp.EmitCategory (Category.AnySingleline, negate, reverse);
+                                       else
+                                               cmp.EmitCategory ((Category)i, negate, reverse);
+                               } else if (neg_cats[i]) {
                                        cmp.EmitCategory ((Category)i, !negate, reverse);
+                               }
                        }
 
                        // emit character/range/sets from meta-collection
@@ -933,7 +951,7 @@ namespace System.Text.RegularExpressions.Syntax {
                private static Interval upper_case_characters = new Interval ((char)65, (char)90);
                private const int distance_between_upper_and_lower_case = 32;
                private bool negate, ignore;
-               private bool[] pos_cats, neg_cats;
+               private BitArray pos_cats, neg_cats;
                private IntervalCollection intervals;
        }