2010-03-03 Rolf Bjarne Kvinge <RKvinge@novell.com>

	* trace.c: We need to parse exclude tokens ('-') before string tokens,
	since the exclude token is a valid string character.

svn path=/trunk/mono/; revision=152906

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index e70689958abf13477a33757ed0934bef7515d386..d92fb702b1cdac4600a1eab5a219a4bebf5fa54b 100755 (executable)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-03  Rolf Bjarne Kvinge  <RKvinge@novell.com>
+
+       * trace.c: We need to parse exclude tokens ('-') before string tokens,
+       since the exclude token is a valid string character.
+
 2010-03-02  Levi Bard  <levi@unity3d.com>
 
        * debugger-agent.c: Invalidate thread stacks on domain unload.

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 340047b75b891beac799a47c487c2a9c07ea50cc..f76d32473c8c744ff68069decf44059849d629c1 100644 (file)
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -132,6 +132,10 @@ get_token (void)
                get_string ();
                return TOKEN_CLASS;
        }
+       if (*input == '-'){
+               input++;
+               return TOKEN_EXCLUDE;
+       }
        if (is_filenamechar (*input)){
                get_string ();
                if (strcmp (value, "all") == 0)
@@ -142,10 +146,6 @@ get_token (void)
                        return TOKEN_DISABLED;
                return TOKEN_STRING;
        }
-       if (*input == '-'){
-               input++;
-               return TOKEN_EXCLUDE;
-       }
        if (*input == ','){
                input++;
                return TOKEN_SEPARATOR;