revert unnecessary TARGET_JVM

svn path=/trunk/mcs/; revision=66184

diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
index 4e11e6db8387829fbfa42498d0ef76535ba3d4a1..aea888842ca18e60e6e0536cf3b70dd6f090718f 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/ChangeLog
+++ b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
@@ -1,6 +1,6 @@
 2006-09-28  Andrew Skiba  <andrews@mainsoft.com>
 
-       * interpreter.cs, Regex.cs: TARGET_JVM
+       * Regex.cs: TARGET_JVM
 
 2006-05-30  Gert Driesen  <drieseng@users.sourceforge.net>
 

diff --git a/mcs/class/System/System.Text.RegularExpressions/interpreter.cs b/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
index 55ce2d2da39445a9e6861b071a94bce7f3cb6a06..9b51789fc8156c6b07eef010c61ef59ae8f4ae0b 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
@@ -48,9 +48,7 @@ namespace System.Text.RegularExpressions {
                        this.qs = null;
 
                        // process info block
-#if !TARGET_JVM
                        Debug.Assert ((OpCode)program[0] == OpCode.Info, "Regex", "Cant' find info block");
-#endif
                        this.group_count = ReadProgramCount (1) + 1;
                        this.match_min = ReadProgramCount (3);
                        //this.match_max = ReadProgramCount (5);
@@ -685,9 +683,7 @@ namespace System.Text.RegularExpressions {
                                }
 
                                case OpCode.Info: {
-#if !TARGET_JVM
                                        Debug.Assert (false, "Regex", "Info block found in pattern");
-#endif
                                        goto Fail;
                                }
                                }
@@ -924,9 +920,7 @@ namespace System.Text.RegularExpressions {
                                //Group not previously matched
                                return false;
                        }
-#if !TARGET_JVM
                        Debug.Assert (marks [b].IsDefined, "Regex", "Balancng group not closed");
-#endif
                        if (gid > 0 && capture){ 
                                Open (gid, marks [b].Index + marks [b].Length);
                                Close (gid, ptr);
@@ -943,9 +937,7 @@ namespace System.Text.RegularExpressions {
                }
 
                private void Backtrack (int cp) {
-#if !TARGET_JVM
                        Debug.Assert (cp > mark_start, "Regex", "Attempt to backtrack forwards");
-#endif
                        for (int i = 0; i < groups.Length; ++ i) {
                                int m = groups [i];
                                while (cp <= m)