Author: arina
Date: 2008-02-03 08:21:12 -0500 (Sun, 03 Feb 2008)
New Revision: 94682
Modified:
trunk/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs
Log:
Fix for bug 9751. Regression on regular expressions should not be happened.
Modified: trunk/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs
===================================================================
--- trunk/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs
2008-02-03 13:06:31 UTC (rev 94681)
+++ trunk/mcs/class/System/System.Text.RegularExpressions/Regex.jvm.cs
2008-02-03 13:21:12 UTC (rev 94682)
@@ -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 @@
if (machineFactory is InterpreterFactory)
return null;
- return (JvmReMachine) ((JvmReMachineFactory)
machineFactory).GetMachine ();
+ return ((JvmReMachineFactory)
machineFactory).GetMachine ();
}
internal int GetJavaNumberByNetNumber (int netNumber) {
@@ -95,20 +84,22 @@
}
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);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
