From 0368fce4daa0b2ffe2bb666dcdf875dd2736cc16 Mon Sep 17 00:00:00 2001 From: Arina Itkes Date: Sun, 3 Feb 2008 13:21:12 +0000 Subject: [PATCH] Fix for bug 9751. Regression on regular expressions should not be happened. svn path=/trunk/mcs/; revision=94682 --- .../Regex.jvm.cs | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs b/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs index 862eb911c02..0578fa46b66 100644 --- a/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs +++ b/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs @@ -28,19 +28,8 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -using System; -using System.Text; -using System.Collections; -using System.Reflection; -using System.Reflection.Emit; using System.Runtime.Serialization; -using RegularExpression = System.Text.RegularExpressions.Syntax.RegularExpression; -using Parser = System.Text.RegularExpressions.Syntax.Parser; - -using System.Diagnostics; - - namespace System.Text.RegularExpressions { public partial class Regex : ISerializable @@ -70,7 +59,7 @@ namespace System.Text.RegularExpressions if (machineFactory is InterpreterFactory) return null; - return (JvmReMachine) ((JvmReMachineFactory) machineFactory).GetMachine (); + return ((JvmReMachineFactory) machineFactory).GetMachine (); } internal int GetJavaNumberByNetNumber (int netNumber) { @@ -95,20 +84,22 @@ namespace System.Text.RegularExpressions } PatternData patternData = null; - try - { + string errorMessage = null; + try{ patternData = PatternDataBuilder.GetPatternData(pattern, roptions); - }catch(Exception e) - { + }catch(Exception e){ #if DEBUG throw; #endif - Console.WriteLine("Creating pattern on JVM failed for pattern " + pattern - + "\n" + e.Message); + errorMessage = "Creating pattern on JVM failed for pattern " + pattern + + "\n" + e.Message; } - if (patternData == null) - InitNewRegex (); + if (patternData == null){ + InitNewRegex(); + if (errorMessage != null) + Console.WriteLine (errorMessage); + } else InitJvmRegex (patternData);