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 387a2f2f87b6c903b239f3d57c49fa27fbfeaf0c..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;
 
@@ -864,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